---

yaml --- r: 200544 b: refs/heads/master c: 8f1c14b h: refs/heads/master v: v3
git-mirror · Jun 23, 2010 · 47abef6 · 47abef6
1 parent bb99a16
commit 47abef6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ceedea7c2600a1018d20f67e766c0773b59391a
+refs/heads/master: 8f1c14b2e3b1805d3e9e6a306d07f5371ea703a7
diff --git a/trunk/include/net/snmp.h b/trunk/include/net/snmp.h
@@ -134,7 +134,7 @@ struct linux_xfrm_mib {
 #define SNMP_ADD_STATS_USER(mib, field, addend)	\
 			this_cpu_add(mib[1]->mibs[field], addend)
 #define SNMP_ADD_STATS(mib, field, addend)	\
-			this_cpu_add(mib[0]->mibs[field], addend)
+			this_cpu_add(mib[!in_softirq()]->mibs[field], addend)
 /*
  * Use "__typeof__(*mib[0]) *ptr" instead of "__typeof__(mib[0]) ptr"
  * to make @ptr a non-percpu pointer.