From 47abef6562899ed135be21bb784281fbf90a5538 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 23 Jun 2010 00:32:03 +0000
Subject: [PATCH] --- yaml --- r: 200544 b: refs/heads/master c:
 8f1c14b2e3b1805d3e9e6a306d07f5371ea703a7 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/snmp.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5f467b1fdfc5..ac949ecd52ea 100644
--- 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
index 92456f1035f5..899003d18db9 100644
--- 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.