From: Jesse Brandeburg <jesse.brandeburg@intel.com>
Date: Thu, 13 May 2010 15:25:33 +0000 (+0000)
Subject: e1000: fix WARN_ON with mac-vlan
X-Git-Tag: v2.6.35-rc1~473^2~122
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a2ec45ddeedaddb9ff8cb98eab7d4f85f44df4a;p=pandora-kernel.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 <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>
---

Reading git-diff-tree failed