| commit | 823dcd2506fa369aeb8cbd26da5663efe2fda9a9 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Aug 20 10:39:12 2011 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Sat Aug 20 10:39:12 2011 -0700 |
| tree | 853b3e3c05f0b9ee1b5df8464db19b7acc57150c | |
| parent | eaa36660de7e174498618d69d7277d44a2f24c3d [diff] [blame] | |
| parent | 98e77438aed3cd3343cbb86825127b1d9d2bea33 [diff] [blame] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index 3784a72..98bb64b 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -5615,7 +5615,8 @@ goto out_error; } - nv_vlan_mode(dev, dev->features); + if (id->driver_data & DEV_HAS_VLAN) + nv_vlan_mode(dev, dev->features); netif_carrier_off(dev);