Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 667d4100 authored by David Kilroy's avatar David Kilroy Committed by John W. Linville
Browse files

orinoco: Multicast to the specified addresses 



When multicasting the driver sets the number of group addresses using
the count from the previous set multicast command. In general this means
you have to set the multicast addresses twice to get the behaviour you
want.

If we were multicasting, and reduce the number of addresses we are
multicasting to, then the driver would write uninitialised data from the
stack into the group addresses to multicast to.

Only write the multicast addresses we have specifically set.

Signed-off-by: default avatarDavid Kilroy <kilroyd@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f0b9f5cb

drivers/net/wireless/orinoco.c

+7 −3
Original line number Diff line number Diff line
@@ -1970,6 +1970,9 @@ __orinoco_set_multicast_list(struct net_device *dev) 
			priv->promiscuous = promisc;

	}



	/* If we're not in promiscuous mode, then we need to set the

	 * group address if either we want to multicast, or if we were

	 * multicasting and want to stop */

	if (! promisc && (mc_count || priv->mc_count) ) {

		struct dev_mc_list *p = dev->mc_list;

		struct hermes_multicast mclist;
@@ -1989,8 +1992,9 @@ __orinoco_set_multicast_list(struct net_device *dev) 
			printk(KERN_WARNING "%s: Multicast list is "

			       "longer than mc_count\n", dev->name);



		err = hermes_write_ltv(hw, USER_BAP, HERMES_RID_CNFGROUPADDRESSES,

				       HERMES_BYTES_TO_RECLEN(priv->mc_count * ETH_ALEN),

		err = hermes_write_ltv(hw, USER_BAP,

				   HERMES_RID_CNFGROUPADDRESSES,

				   HERMES_BYTES_TO_RECLEN(mc_count * ETH_ALEN),

				   &mclist);

		if (err)

			printk(KERN_ERR "%s: Error %d setting multicast list.\n",