diff options
author | David S. Miller | 2011-08-20 19:39:12 +0200 |
---|---|---|
committer | David S. Miller | 2011-08-20 19:39:12 +0200 |
commit | 823dcd2506fa369aeb8cbd26da5663efe2fda9a9 (patch) | |
tree | 853b3e3c05f0b9ee1b5df8464db19b7acc57150c /drivers/net/ethernet/nvidia | |
parent | tg3: Update version to 3.120 (diff) | |
parent | ipv6: Fix ipv6_getsockopt for IPV6_2292PKTOPTIONS (diff) | |
download | kernel-qcow2-linux-823dcd2506fa369aeb8cbd26da5663efe2fda9a9.tar.gz kernel-qcow2-linux-823dcd2506fa369aeb8cbd26da5663efe2fda9a9.tar.xz kernel-qcow2-linux-823dcd2506fa369aeb8cbd26da5663efe2fda9a9.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/nvidia')
-rw-r--r-- | drivers/net/ethernet/nvidia/forcedeth.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index 3784a727692e..98bb64bc24d9 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c @@ -5615,7 +5615,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i 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); |