Commit 2a5391a1 authored by Michael Ellerman's avatar Michael Ellerman Committed by Jeff Garzik
Browse files

[PATCH] iseries_veth: Fix broken promiscuous handling 



Due to a logic bug, once promiscuous mode is enabled in the iseries_veth
driver it is never disabled.

The driver keeps two flags, promiscuous and all_mcast which have exactly the
same effect. This is because we only ever receive packets destined for us,
or multicast packets. So consolidate them into one promiscuous flag for
simplicity.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 58c5900b

drivers/net/iseries_veth.c

+5 −11
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ struct veth_port { 


	rwlock_t mcast_gate;

	int promiscuous;

	int all_mcast;

	int num_mcast;

	u64 mcast_addr[VETH_MAX_MCAST];

};
@@ -756,17 +755,15 @@ static void veth_set_multicast_list(struct net_device *dev) 


	write_lock_irqsave(&port->mcast_gate, flags);



	if (dev->flags & IFF_PROMISC) {	/* set promiscuous mode */

		printk(KERN_INFO "%s: Promiscuous mode enabled.\n",

		       dev->name);

	if ((dev->flags & IFF_PROMISC) || (dev->flags & IFF_ALLMULTI) ||

			(dev->mc_count > VETH_MAX_MCAST)) {

		port->promiscuous = 1;

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

		    || (dev->mc_count > VETH_MAX_MCAST) ) {

		port->all_mcast = 1;

	} else {

		struct dev_mc_list *dmi = dev->mc_list;

		int i;



		port->promiscuous = 0;



		/* Update table */

		port->num_mcast = 0;
@@ -1145,12 +1142,9 @@ static inline int veth_frame_wanted(struct veth_port *port, u64 mac_addr) 
	if ( (mac_addr == port->mac_addr) || (mac_addr == 0xffffffffffff0000) )

		return 1;



	if (! (((char *) &mac_addr)[0] & 0x01))

		return 0;



	read_lock_irqsave(&port->mcast_gate, flags);



	if (port->promiscuous || port->all_mcast) {

	if (port->promiscuous) {

		wanted = 1;

		goto out;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE