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

Commit 2f8bc32b authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

vlan: enable multiqueue xmits 



vlan_dev_hard_start_xmit() & vlan_dev_hwaccel_hard_start_xmit()
select txqueue number 0, instead of using index provided by
skb_get_queue_mapping().

This is not correct after commit 2e59af3d
[vlan: multiqueue vlan device] because
txq->tx_packets  & txq->tx_bytes changes are performed on
a single location, and not the right locking.

Fix is to take the appropriate struct netdev_queue pointer

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d1b19dff

net/8021q/vlan_dev.c

+4 −2
Original line number Diff line number Diff line
@@ -291,7 +291,8 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev, 
static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb,

					    struct net_device *dev)

{

	struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);

	int i = skb_get_queue_mapping(skb);

	struct netdev_queue *txq = netdev_get_tx_queue(dev, i);

	struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data);



	/* Handle non-VLAN frames if they are sent to us, for example by DHCP.
@@ -329,7 +330,8 @@ static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb, 
static netdev_tx_t vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb,

						    struct net_device *dev)

{

	struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);

	int i = skb_get_queue_mapping(skb);

	struct netdev_queue *txq = netdev_get_tx_queue(dev, i);

	u16 vlan_tci;



	vlan_tci = vlan_dev_info(dev)->vlan_id;