From faeb912f8cc2bad3c3dd715044e31d7df30d9307 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 3 Oct 2011 04:42:46 +0000 Subject: [PATCH] --- yaml --- r: 266398 b: refs/heads/master c: 09994d1b09bd9b0046a4708fa50d2106610a4058 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e4036bc3712f..66f78cf66a6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76231e0297db30f1f0e947a02b42495e7d535d56 +refs/heads/master: 09994d1b09bd9b0046a4708fa50d2106610a4058 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 7f4486e127e9..70ecb86439ca 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -2670,10 +2670,7 @@ static struct rps_dev_flow * set_rps_cpu(struct net_device *dev, struct sk_buff *skb, struct rps_dev_flow *rflow, u16 next_cpu) { - u16 tcpu; - - tcpu = rflow->cpu = next_cpu; - if (tcpu != RPS_NO_CPU) { + if (next_cpu != RPS_NO_CPU) { #ifdef CONFIG_RFS_ACCEL struct netdev_rx_queue *rxqueue; struct rps_dev_flow_table *flow_table; @@ -2701,16 +2698,16 @@ set_rps_cpu(struct net_device *dev, struct sk_buff *skb, goto out; old_rflow = rflow; rflow = &flow_table->flows[flow_id]; - rflow->cpu = next_cpu; rflow->filter = rc; if (old_rflow->filter == rflow->filter) old_rflow->filter = RPS_NO_FILTER; out: #endif rflow->last_qtail = - per_cpu(softnet_data, tcpu).input_queue_head; + per_cpu(softnet_data, next_cpu).input_queue_head; } + rflow->cpu = next_cpu; return rflow; }