net: fix tx queue selection for bridged devices implementing select_queue
Subsystems (2)
PATCH 1/1 net: fix tx queue selection for bridged devices implementing select_queue
When a net device is implementing the select_queue callback and is part of a bridge, frames coming from the bridge already have a tx queue associated to the socket (introduced in commit a4ee3ce3293dc931fab19beb472a8bde1295aebe, "net: Use sk_tx_queue_mapping for connected sockets"). The call to sk_tx_queue_get will then return the tx queue used by the bridge instead of calling the select_queue callback.
In case of mac80211 this broke QoS which is implemented by using the select_queue callback. Furthermore it introduced problems with rt2x00 because frames with the same TID and RA sometimes appeared on different tx queues which the hw cannot handle correctly.
Fix this by always calling select_queue first if it is available and only afterwards use the socket tx queue mapping.
---
JFI this patch is based on wireless-testing.
net/core/dev.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
net/core/dev.c +8 -8
@@ -2058,16 +2058,16 @@ static struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb) {int queue_index; -struct sock *sk = skb->sk; +const struct net_device_ops *ops = dev->netdev_ops; - queue_index =sk_tx_queue_get (sk); -if (queue_index <0 ) { -const struct net_device_ops *ops = dev->netdev_ops; +if (ops->ndo_select_queue) { + queue_index = ops->ndo_select_queue (dev, skb); + queue_index =dev_cap_txqueue (dev, queue_index); + }else { +struct sock *sk = skb->sk; + queue_index =sk_tx_queue_get (sk); +if (queue_index <0 ) { -if (ops->ndo_select_queue) { - queue_index = ops->ndo_select_queue (dev, skb); - queue_index =dev_cap_txqueue (dev, queue_index); - }else { queue_index =0 ;if (dev->real_num_tx_queues >1 ) queue_index =skb_tx_hash (dev, skb);
Signature · 1 line
1.7.1
From: Helmut Schaa <[email protected]>
Date: Fri, 3 Sep 2010 14:39:56 +0200
Quoted 12 lines
When a net device is implementing the
select_queuecallback and is part of a bridge, frames coming from the bridge already have a tx queue associated to the socket (introduced in commita4ee3ce3293dc931fab19beb472a8bde1295aebe, "net: Usesk_tx_queue_mappingfor connected sockets"). The call tosk_tx_queue_getwill then return the tx queue used by the bridge instead of calling theselect_queuecallback.In case of mac80211 this broke QoS which is implemented by using the
select_queuecallback. Furthermore it introduced problems with rt2x00 because frames with the same TID and RA sometimes appeared on different tx queues which the hw cannot handle correctly.
Quoted 4 lines
Fix this by always calling
select_queuefirst if it is available and only afterwards use the socket tx queue mapping.Signed-off-by Helmut Schaa <[email protected]>
Applied to net-2.6, thanks Helmut.