From: Stephen Hemminger <shemminger@vyatta.com>
Date: Thu, 8 Jan 2009 01:36:07 +0000 (-0800)
Subject: ns83820: fix net_device_ops support
X-Git-Tag: v2.6.29-rc1~45^2~48
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a7d1de25dc2e823c741cf1ae86a59379ca5a6804;p=linux-2.6-omap-h63xx.git

ns83820: fix net_device_ops support

The vlan_rx_register fuction is now in net_device_ops

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 46b0772489e..42021aca1dd 100644
--- a/drivers/net/ns83820.c
+++ b/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) {