---

yaml --- r: 263228 b: refs/heads/master c: 9331db4 h: refs/heads/master v: v3
git-mirror · Aug 18, 2011 · cab8ae8 · cab8ae8
1 parent 3f899ee
commit cab8ae8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a75a97296c43c34add7dca8275496186e1b4ae9
+refs/heads/master: 9331db4f00cfee8a79d2147ac83723ef436b9759
diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/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);