aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLi RongQing <roy.qing.li@gmail.com>2013-03-27 23:42:41 +0000
committerDavid S. Miller <davem@davemloft.net>2013-03-29 15:13:27 -0400
commit50eab0503a7579ada512e4968738b7c9737cf36e (patch)
tree1f30b4ab0a76ff4c74a1de2b2cf2426e66bada1c /net
parentbonding: fix disabling of arp_interval and miimon (diff)
downloadlinux-dev-50eab0503a7579ada512e4968738b7c9737cf36e.tar.xz
linux-dev-50eab0503a7579ada512e4968738b7c9737cf36e.zip
net: fix the use of this_cpu_ptr
flush_tasklet is not percpu var, and percpu is percpu var, and this_cpu_ptr(&info->cache->percpu->flush_tasklet) is not equal to &this_cpu_ptr(info->cache->percpu)->flush_tasklet 1f743b076(use this_cpu_ptr per-cpu helper) introduced this bug. Signed-off-by: Li RongQing <roy.qing.li@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/flow.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/flow.c b/net/core/flow.c
index c56ea6f7f6c7..2bfd081c59f7 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -328,7 +328,7 @@ static void flow_cache_flush_per_cpu(void *data)
struct flow_flush_info *info = data;
struct tasklet_struct *tasklet;
- tasklet = this_cpu_ptr(&info->cache->percpu->flush_tasklet);
+ tasklet = &this_cpu_ptr(info->cache->percpu)->flush_tasklet;
tasklet->data = (unsigned long)info;
tasklet_schedule(tasklet);
}