X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=net%2Fcore%2Fdev.c;h=974199daa911488df13c8902344ee857f23440e4;hb=67f4efdce7d85282fbd5832cddc80a07eb89b6d6;hp=2705a2ab89af6a0b91e935dc3994b17f690ff34d;hpb=c53aa5058ad5ca8876a47d6639ad4d4f2c5ed584;p=firefly-linux-kernel-4.4.55.git

diff --git a/net/core/dev.c b/net/core/dev.c
index 2705a2ab89af..974199daa911 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2895,8 +2895,10 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb,
 		if (unlikely(tcpu != next_cpu) &&
 		    (tcpu == RPS_NO_CPU || !cpu_online(tcpu) ||
 		     ((int)(per_cpu(softnet_data, tcpu).input_queue_head -
-		      rflow->last_qtail)) >= 0))
+		      rflow->last_qtail)) >= 0)) {
+			tcpu = next_cpu;
 			rflow = set_rps_cpu(dev, skb, rflow, next_cpu);
+		}
 
 		if (tcpu != RPS_NO_CPU && cpu_online(tcpu)) {
 			*rflowp = rflow;