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

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
...@@ -2161,8 +2161,6 @@ static void e1000_set_rx_mode(struct net_device *netdev) ...@@ -2161,8 +2161,6 @@ static void e1000_set_rx_mode(struct net_device *netdev)
e1000_rar_set(hw, ha->addr, i++); e1000_rar_set(hw, ha->addr, i++);
} }
WARN_ON(i == rar_entries);
netdev_for_each_mc_addr(ha, netdev) { netdev_for_each_mc_addr(ha, netdev) {
if (i == rar_entries) { if (i == rar_entries) {
/* load any remaining addresses into the hash table */ /* load any remaining addresses into the hash table */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment