From 44c9df7e996979afff82fefab1a4495946202929 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed, 7 Jan 2009 17:36:07 -0800
Subject: [PATCH] --- yaml --- r: 127798 b: refs/heads/master c:
 a7d1de25dc2e823c741cf1ae86a59379ca5a6804 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6fbbab1b5fbc..86be3bfc912f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97488c5b2d5b2121da3bc386558488598fb0ce23
+refs/heads/master: a7d1de25dc2e823c741cf1ae86a59379ca5a6804
diff --git a/trunk/drivers/net/ns83820.c b/trunk/drivers/net/ns83820.c
index 46b0772489e4..42021aca1ddd 100644
--- a/trunk/drivers/net/ns83820.c
+++ b/trunk/drivers/net/ns83820.c
@@ -1957,6 +1957,9 @@ static const struct net_device_ops netdev_ops = {
 	.ndo_set_multicast_list = ns83820_set_multicast,
 	.ndo_validate_addr	= eth_validate_addr,
 	.ndo_tx_timeout		= ns83820_tx_timeout,
+#ifdef NS83820_VLAN_ACCEL_SUPPORT
+	.ndo_vlan_rx_register	= ns83820_vlan_rx_register,
+#endif
 };
 
 static int __devinit ns83820_init_one(struct pci_dev *pci_dev,
@@ -2216,7 +2219,6 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev,
 #ifdef NS83820_VLAN_ACCEL_SUPPORT
 	/* We also support hardware vlan acceleration */
 	ndev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-	ndev->vlan_rx_register = ns83820_vlan_rx_register;
 #endif
 
 	if (using_dac) {