From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Date: Thu, 2 Jan 2014 05:24:28 +0000 (+0800)
Subject: tun, rfs: fix the incorrect hash value
X-Git-Tag: firefly_0821_release~176^2~4570^2~323
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fbe4d4565badba393a94927e16ae66654a025dca;p=firefly-linux-kernel-4.4.55.git

tun, rfs: fix the incorrect hash value

The code incorrectly save the queue index as the hash, so this patch
is fixing it with the hash received in the stack receive path.

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 3cf0457f5c69..09f66624eaca 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -378,8 +378,8 @@ static u16 tun_select_queue(struct net_device *dev, struct sk_buff *skb)
 	if (txq) {
 		e = tun_flow_find(&tun->flows[tun_hashfn(txq)], txq);
 		if (e) {
-			txq = e->queue_index;
 			tun_flow_save_rps_rxhash(e, txq);
+			txq = e->queue_index;
 		} else
 			/* use multiply and shift instead of expensive divide */
 			txq = ((u64)txq * numqueues) >> 32;