diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-01-07 17:36:07 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-07 17:36:07 -0800 |
commit | a7d1de25dc2e823c741cf1ae86a59379ca5a6804 (patch) | |
tree | c5d00f6ff468e686335ee1b95d890a9caa0a188f | |
parent | 97488c5b2d5b2121da3bc386558488598fb0ce23 (diff) | |
download | op-kernel-dev-a7d1de25dc2e823c741cf1ae86a59379ca5a6804.zip op-kernel-dev-a7d1de25dc2e823c741cf1ae86a59379ca5a6804.tar.gz |
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>
-rw-r--r-- | drivers/net/ns83820.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c index 46b0772..42021ac 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) { |