From: Jesse Brandeburg Date: Thu, 13 May 2010 15:25:33 +0000 (+0000) Subject: e1000: fix WARN_ON with mac-vlan X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2a2ec45ddeedaddb9ff8cb98eab7d4f85f44df4a;p=mv-sheeva.git 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 Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller --- diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index f06c8975f88..5de738a6d0e 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -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 */