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

Commit 0761248f authored by Roel Kluin's avatar Roel Kluin Committed by Jeff Garzik
Browse files

ipg: fix receivemode IPG_RM_RECEIVEMULTICAST{,HASH} in ipg_nic_set_multicast_list() 



The branches are dead code.  even when dev->flag IFF_MULTICAST (defined
0x1000) is set, dev->flags & IFF_MULTICAST & [boolean] always evaluates to
0.

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Cc: Francois Romieu <romieu@fr.zoreil.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 513fd370

drivers/net/ipg.c

+2 −2
Original line number Diff line number Diff line
@@ -577,12 +577,12 @@ static void ipg_nic_set_multicast_list(struct net_device *dev) 
		/* NIC to be configured in promiscuous mode. */

		receivemode = IPG_RM_RECEIVEALLFRAMES;

	} else if ((dev->flags & IFF_ALLMULTI) ||

		   (dev->flags & IFF_MULTICAST &

		   ((dev->flags & IFF_MULTICAST) &&

		    (dev->mc_count > IPG_MULTICAST_HASHTABLE_SIZE))) {

		/* NIC to be configured to receive all multicast

		 * frames. */

		receivemode |= IPG_RM_RECEIVEMULTICAST;

	} else if (dev->flags & IFF_MULTICAST & (dev->mc_count > 0)) {

	} else if ((dev->flags & IFF_MULTICAST) && (dev->mc_count > 0)) {

		/* NIC to be configured to receive selected

		 * multicast addresses. */

		receivemode |= IPG_RM_RECEIVEMULTICASTHASH;