Commit 50d1784e authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: fix multiqueue selection

commit 416186fb

 ("net: Split core bits of netdev_pick_tx
into __netdev_pick_tx") added a bug that disables caching of queue
index in the socket.

This is the source of packet reorders for TCP flows, and
again this is happening more often when using FQ pacing.

Old code was doing

if (queue_index != old_index)
	sk_tx_queue_set(sk, queue_index);

Alexander renamed the variables but forgot to change sk_tx_queue_set()
2nd parameter.

if (queue_index != new_index)
	sk_tx_queue_set(sk, queue_index);

This means we store -1 over and over in sk->sk_tx_queue_mapping
Signed-off-by: default avatarEric Dumazet <>
Cc: Alexander Duyck <>
Acked-by: default avatarAlexander Duyck <>
Signed-off-by: default avatarDavid S. Miller <>
parent 88362ad8
......@@ -352,7 +352,7 @@ u16 __netdev_pick_tx(struct net_device *dev, struct sk_buff *skb)
if (queue_index != new_index && sk &&
sk_tx_queue_set(sk, queue_index);
sk_tx_queue_set(sk, new_index);
queue_index = new_index;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment