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

Commit 7ad09458 authored by Somnath kotur's avatar Somnath kotur Committed by David S. Miller
Browse files

be2net: clear promiscuous bits in adapter->flags while disabling promiscuous mode 



We should clear promiscuous bits in adapter->flags while disabling promiscuous
mode. Else we will not put interface back into VLAN promisc mode if the vlans
already added exceeds the maximum limit.

Signed-off-by: default avatarKalesh AP <kalesh.purayil@emulex.com>
Signed-off-by: default avatarSomnath Kotur <somnath.kotur@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c502224e

drivers/net/ethernet/emulex/benet/be_main.c

+9 −3
Original line number Diff line number Diff line
@@ -1157,6 +1157,14 @@ static int be_vlan_rem_vid(struct net_device *netdev, __be16 proto, u16 vid) 
	return status;

}



static void be_clear_promisc(struct be_adapter *adapter)

{

	adapter->promiscuous = false;

	adapter->flags &= ~BE_FLAGS_VLAN_PROMISC;



	be_cmd_rx_filter(adapter, IFF_PROMISC, OFF);

}



static void be_set_rx_mode(struct net_device *netdev)

{

	struct be_adapter *adapter = netdev_priv(netdev);
@@ -1170,9 +1178,7 @@ static void be_set_rx_mode(struct net_device *netdev) 


	/* BE was previously in promiscuous mode; disable it */

	if (adapter->promiscuous) {

		adapter->promiscuous = false;

		be_cmd_rx_filter(adapter, IFF_PROMISC, OFF);



		be_clear_promisc(adapter);

		if (adapter->vlans_added)

			be_vid_config(adapter);

	}