From cab8ae875d3ce9faaad74f8ca19a753c9272c6a3 Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jpirko@redhat.com>
Date: Wed, 17 Aug 2011 23:50:37 -0700
Subject: [PATCH] --- yaml --- r: 263228 b: refs/heads/master c:
 9331db4f00cfee8a79d2147ac83723ef436b9759 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/net/forcedeth.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 08a269aadac9..478bc5dceb68 100644
--- 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
index e55df308a3af..6d5fbd4d4256 100644
--- 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);