diff options
| author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2010-05-13 15:25:33 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-14 03:06:18 -0700 |
| commit | 2a2ec45ddeedaddb9ff8cb98eab7d4f85f44df4a (patch) | |
| tree | 66f498acfb60c7a1da8a5ff6c617e8f45b820b2a /drivers/net/e1000 | |
| parent | a4b770972b8f819e408d7cc3ae9637e15bff62f6 (diff) | |
| download | talos-op-linux-2a2ec45ddeedaddb9ff8cb98eab7d4f85f44df4a.tar.gz talos-op-linux-2a2ec45ddeedaddb9ff8cb98eab7d4f85f44df4a.zip | |
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: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index f06c8975f886..5de738a6d0e6 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 */ |
