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

Commit 213b15ca authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

vlan: remove ndo_select_queue() logic 



Now vlan are lockless, we dont need special ndo_select_queue() logic.
dev_pick_tx() will do the multiqueue stuff on the real device transmit.

Suggested-by: default avatarJesse Gross <jesse@nicira.com>
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Acked-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4af429d2

net/8021q/vlan_dev.c

+2 −38
Original line number Diff line number Diff line
@@ -346,14 +346,6 @@ static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb, 
	return ret;

}



static u16 vlan_dev_select_queue(struct net_device *dev, struct sk_buff *skb)

{

	struct net_device *rdev = vlan_dev_info(dev)->real_dev;

	const struct net_device_ops *ops = rdev->netdev_ops;



	return ops->ndo_select_queue(rdev, skb);

}



static int vlan_dev_change_mtu(struct net_device *dev, int new_mtu)

{

	/* TODO: gotta make sure the underlying layer can handle it,
@@ -682,7 +674,7 @@ static const struct header_ops vlan_header_ops = { 
	.parse	 = eth_header_parse,

};



static const struct net_device_ops vlan_netdev_ops, vlan_netdev_ops_sq;

static const struct net_device_ops vlan_netdev_ops;



static int vlan_dev_init(struct net_device *dev)

{
@@ -723,9 +715,6 @@ static int vlan_dev_init(struct net_device *dev) 
		dev->hard_header_len = real_dev->hard_header_len + VLAN_HLEN;

	}



	if (real_dev->netdev_ops->ndo_select_queue)

		dev->netdev_ops = &vlan_netdev_ops_sq;

	else

	dev->netdev_ops = &vlan_netdev_ops;



	if (is_vlan_dev(real_dev))
@@ -872,31 +861,6 @@ static const struct net_device_ops vlan_netdev_ops = { 
#endif

};



static const struct net_device_ops vlan_netdev_ops_sq = {

	.ndo_select_queue	= vlan_dev_select_queue,

	.ndo_change_mtu		= vlan_dev_change_mtu,

	.ndo_init		= vlan_dev_init,

	.ndo_uninit		= vlan_dev_uninit,

	.ndo_open		= vlan_dev_open,

	.ndo_stop		= vlan_dev_stop,

	.ndo_start_xmit =  vlan_dev_hard_start_xmit,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address	= vlan_dev_set_mac_address,

	.ndo_set_rx_mode	= vlan_dev_set_rx_mode,

	.ndo_set_multicast_list	= vlan_dev_set_rx_mode,

	.ndo_change_rx_flags	= vlan_dev_change_rx_flags,

	.ndo_do_ioctl		= vlan_dev_ioctl,

	.ndo_neigh_setup	= vlan_dev_neigh_setup,

	.ndo_get_stats64	= vlan_dev_get_stats64,

#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)

	.ndo_fcoe_ddp_setup	= vlan_dev_fcoe_ddp_setup,

	.ndo_fcoe_ddp_done	= vlan_dev_fcoe_ddp_done,

	.ndo_fcoe_enable	= vlan_dev_fcoe_enable,

	.ndo_fcoe_disable	= vlan_dev_fcoe_disable,

	.ndo_fcoe_get_wwn	= vlan_dev_fcoe_get_wwn,

#endif

};



void vlan_setup(struct net_device *dev)

{

	ether_setup(dev);