diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:38:13 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:38:13 -0500 |
commit | cb18eccff48ef3986d1072964590bce6fec705fb (patch) | |
tree | 777fb1d15e0281341e1e02c9803d989538d346f2 /net/ipv6/proc.c | |
parent | c827ba4cb49a30ce581201fd0ba2be77cde412c7 (diff) | |
parent | 5ef213f6842277ee1df5659f59fac0ffc9beb411 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (45 commits)
[IPV4]: Restore multipath routing after rt_next changes.
[XFRM] IPV6: Fix outbound RO transformation which is broken by IPsec tunnel patch.
[NET]: Reorder fields of struct dst_entry
[DECNET]: Convert decnet route to use the new dst_entry 'next' pointer
[IPV6]: Convert ipv6 route to use the new dst_entry 'next' pointer
[IPV4]: Convert ipv4 route to use the new dst_entry 'next' pointer
[NET]: Introduce union in struct dst_entry to hold 'next' pointer
[DECNET]: fix misannotation of linkinfo_dn
[DECNET]: FRA_{DST,SRC} are le16 for decnet
[UDP]: UDP can use sk_hash to speedup lookups
[NET]: Fix whitespace errors.
[NET] XFRM: Fix whitespace errors.
[NET] X25: Fix whitespace errors.
[NET] WANROUTER: Fix whitespace errors.
[NET] UNIX: Fix whitespace errors.
[NET] TIPC: Fix whitespace errors.
[NET] SUNRPC: Fix whitespace errors.
[NET] SCTP: Fix whitespace errors.
[NET] SCHED: Fix whitespace errors.
[NET] RXRPC: Fix whitespace errors.
...
Diffstat (limited to 'net/ipv6/proc.c')
-rw-r--r-- | net/ipv6/proc.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c index 35249d8487bb..032ef95c5b00 100644 --- a/net/ipv6/proc.c +++ b/net/ipv6/proc.c | |||
@@ -50,7 +50,7 @@ static int sockstat6_seq_show(struct seq_file *seq, void *v) | |||
50 | seq_printf(seq, "UDP6: inuse %d\n", | 50 | seq_printf(seq, "UDP6: inuse %d\n", |
51 | fold_prot_inuse(&udpv6_prot)); | 51 | fold_prot_inuse(&udpv6_prot)); |
52 | seq_printf(seq, "UDPLITE6: inuse %d\n", | 52 | seq_printf(seq, "UDPLITE6: inuse %d\n", |
53 | fold_prot_inuse(&udplitev6_prot)); | 53 | fold_prot_inuse(&udplitev6_prot)); |
54 | seq_printf(seq, "RAW6: inuse %d\n", | 54 | seq_printf(seq, "RAW6: inuse %d\n", |
55 | fold_prot_inuse(&rawv6_prot)); | 55 | fold_prot_inuse(&rawv6_prot)); |
56 | seq_printf(seq, "FRAG6: inuse %d memory %d\n", | 56 | seq_printf(seq, "FRAG6: inuse %d memory %d\n", |
@@ -89,7 +89,7 @@ static struct snmp_mib snmp6_icmp6_list[] = { | |||
89 | /* icmpv6 mib according to RFC 2466 | 89 | /* icmpv6 mib according to RFC 2466 |
90 | 90 | ||
91 | Exceptions: {In|Out}AdminProhibs are removed, because I see | 91 | Exceptions: {In|Out}AdminProhibs are removed, because I see |
92 | no good reasons to account them separately | 92 | no good reasons to account them separately |
93 | of another dest.unreachs. | 93 | of another dest.unreachs. |
94 | OutErrs is zero identically. | 94 | OutErrs is zero identically. |
95 | OutEchos too. | 95 | OutEchos too. |
@@ -146,14 +146,14 @@ static struct snmp_mib snmp6_udplite6_list[] = { | |||
146 | static unsigned long | 146 | static unsigned long |
147 | fold_field(void *mib[], int offt) | 147 | fold_field(void *mib[], int offt) |
148 | { | 148 | { |
149 | unsigned long res = 0; | 149 | unsigned long res = 0; |
150 | int i; | 150 | int i; |
151 | 151 | ||
152 | for_each_possible_cpu(i) { | 152 | for_each_possible_cpu(i) { |
153 | res += *(((unsigned long *)per_cpu_ptr(mib[0], i)) + offt); | 153 | res += *(((unsigned long *)per_cpu_ptr(mib[0], i)) + offt); |
154 | res += *(((unsigned long *)per_cpu_ptr(mib[1], i)) + offt); | 154 | res += *(((unsigned long *)per_cpu_ptr(mib[1], i)) + offt); |
155 | } | 155 | } |
156 | return res; | 156 | return res; |
157 | } | 157 | } |
158 | 158 | ||
159 | static inline void | 159 | static inline void |
@@ -161,7 +161,7 @@ snmp6_seq_show_item(struct seq_file *seq, void **mib, struct snmp_mib *itemlist) | |||
161 | { | 161 | { |
162 | int i; | 162 | int i; |
163 | for (i=0; itemlist[i].name; i++) | 163 | for (i=0; itemlist[i].name; i++) |
164 | seq_printf(seq, "%-32s\t%lu\n", itemlist[i].name, | 164 | seq_printf(seq, "%-32s\t%lu\n", itemlist[i].name, |
165 | fold_field(mib, itemlist[i].entry)); | 165 | fold_field(mib, itemlist[i].entry)); |
166 | } | 166 | } |
167 | 167 | ||