e1000: fix WARN_ON with mac-vlan
authorJesse Brandeburg <jesse.brandeburg@intel.com>
Thu, 13 May 2010 15:25:33 +0000 (15:25 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 14 May 2010 10:06:18 +0000 (03:06 -0700)
commit2a2ec45ddeedaddb9ff8cb98eab7d4f85f44df4a
tree66f498acfb60c7a1da8a5ff6c617e8f45b820b2a
parenta4b770972b8f819e408d7cc3ae9637e15bff62f6
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>
drivers/net/e1000/e1000_main.c