Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7d1de25 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

ns83820: fix net_device_ops support 



The vlan_rx_register fuction is now in net_device_ops

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 97488c5b

drivers/net/ns83820.c

+3 −1
Original line number Diff line number Diff line
@@ -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) {