Message ID | 20110805114411.GE1928@minipsycho.orion |
---|---|
State | RFC, archived |
Delegated to: | David Miller |
Headers | show |
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index e55df30..3f1b24b 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c @@ -5341,7 +5341,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i } np->vlanctl_bits = 0; - if (id->driver_data & DEV_HAS_VLAN) { + if (id->driver_data & DEV_HAS_VLAN && nv_optimized(np)) { np->vlanctl_bits = NVREG_VLANCONTROL_ENABLE; dev->hw_features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX; }