]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
ns83820: fix net_device_ops support
authorStephen Hemminger <shemminger@vyatta.com>
Thu, 8 Jan 2009 01:36:07 +0000 (17:36 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 8 Jan 2009 01:36:07 +0000 (17:36 -0800)
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>
drivers/net/ns83820.c

index 46b0772489e4d92b6298c6fcfdb51b95b8ac7c40..42021aca1ddd038801cf3deefbe01950f1003ddc 100644 (file)
@@ -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) {