diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-23 21:26:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-23 21:26:27 -0400 |
| commit | 8244132ea89cdd128003f5b9980fab50d8d36d72 (patch) | |
| tree | c6cf9327cf9b6bab5bb830bbf389a514f4d7bb95 /include | |
| parent | 7b2ff18ee7b0ec4bc3162f821e221781aaca48bd (diff) | |
| parent | 38000a94a902e94ca8b5498f7871c6316de8957a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/ip_output.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/snmp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/snmp.h b/include/net/snmp.h index 92456f1035f5..899003d18db9 100644 --- a/include/net/snmp.h +++ b/include/net/snmp.h | |||
| @@ -134,7 +134,7 @@ struct linux_xfrm_mib { | |||
| 134 | #define SNMP_ADD_STATS_USER(mib, field, addend) \ | 134 | #define SNMP_ADD_STATS_USER(mib, field, addend) \ |
| 135 | this_cpu_add(mib[1]->mibs[field], addend) | 135 | this_cpu_add(mib[1]->mibs[field], addend) |
| 136 | #define SNMP_ADD_STATS(mib, field, addend) \ | 136 | #define SNMP_ADD_STATS(mib, field, addend) \ |
| 137 | this_cpu_add(mib[0]->mibs[field], addend) | 137 | this_cpu_add(mib[!in_softirq()]->mibs[field], addend) |
| 138 | /* | 138 | /* |
| 139 | * Use "__typeof__(*mib[0]) *ptr" instead of "__typeof__(mib[0]) ptr" | 139 | * Use "__typeof__(*mib[0]) *ptr" instead of "__typeof__(mib[0]) ptr" |
| 140 | * to make @ptr a non-percpu pointer. | 140 | * to make @ptr a non-percpu pointer. |