xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net

Browse Source
This commit is contained in:
David S. Miller
2011-08-20 10:39:12 -07:00
parent eaa36660de 98e77438ae
commit 823dcd2506
265 changed files with 9171 additions and 8040 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/nvidia/forcedeth.c
View File

@@ -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);