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

Commit 2a2ec45d authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by David S. Miller
Browse files

e1000: fix WARN_ON with mac-vlan 



When adding more than 14 mac-vlan adapters on e1000 the driver
would fire a WARN_ON when adding the 15th.  The WARN_ON in this
case is completely un-necessary, as the code below the WARN_ON is
directly handling the value the WARN_ON triggered on.

CC: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a4b77097

drivers/net/e1000/e1000_main.c

+0 −2
Original line number Diff line number Diff line
@@ -2161,8 +2161,6 @@ static void e1000_set_rx_mode(struct net_device *netdev) 
			e1000_rar_set(hw, ha->addr, i++);

		}



	WARN_ON(i == rar_entries);



	netdev_for_each_mc_addr(ha, netdev) {

		if (i == rar_entries) {

			/* load any remaining addresses into the hash table */