* [PATCH 1/2] ipv4: spaces required around that '='
@ 2013-12-31 7:11 Chen Weilong
2013-12-31 7:11 ` [PATCH 2/2] ipv4: switch and case should be at the same indent Chen Weilong
2014-01-02 8:31 ` [PATCH 1/2] ipv4: spaces required around that '=' David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Chen Weilong @ 2013-12-31 7:11 UTC (permalink / raw)
To: davem, kuznet, jmorris, yoshfuji, kaber; +Cc: netdev
From: Weilong Chen <chenweilong@huawei.com>
Signed-off-by: Weilong Chen <chenweilong@huawei.com>
---
net/ipv4/proc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index 8ecd7ad..a6c8a80 100644
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -333,22 +333,22 @@ static void icmp_put(struct seq_file *seq)
atomic_long_t *ptr = net->mib.icmpmsg_statistics->mibs;
seq_puts(seq, "\nIcmp: InMsgs InErrors InCsumErrors");
- for (i=0; icmpmibmap[i].name != NULL; i++)
+ for (i = 0; icmpmibmap[i].name != NULL; i++)
seq_printf(seq, " In%s", icmpmibmap[i].name);
seq_printf(seq, " OutMsgs OutErrors");
- for (i=0; icmpmibmap[i].name != NULL; i++)
+ for (i = 0; icmpmibmap[i].name != NULL; i++)
seq_printf(seq, " Out%s", icmpmibmap[i].name);
seq_printf(seq, "\nIcmp: %lu %lu %lu",
snmp_fold_field((void __percpu **) net->mib.icmp_statistics, ICMP_MIB_INMSGS),
snmp_fold_field((void __percpu **) net->mib.icmp_statistics, ICMP_MIB_INERRORS),
snmp_fold_field((void __percpu **) net->mib.icmp_statistics, ICMP_MIB_CSUMERRORS));
- for (i=0; icmpmibmap[i].name != NULL; i++)
+ for (i = 0; icmpmibmap[i].name != NULL; i++)
seq_printf(seq, " %lu",
atomic_long_read(ptr + icmpmibmap[i].index));
seq_printf(seq, " %lu %lu",
snmp_fold_field((void __percpu **) net->mib.icmp_statistics, ICMP_MIB_OUTMSGS),
snmp_fold_field((void __percpu **) net->mib.icmp_statistics, ICMP_MIB_OUTERRORS));
- for (i=0; icmpmibmap[i].name != NULL; i++)
+ for (i = 0; icmpmibmap[i].name != NULL; i++)
seq_printf(seq, " %lu",
atomic_long_read(ptr + (icmpmibmap[i].index | 0x100)));
}
--
1.7.12
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ipv4: switch and case should be at the same indent
2013-12-31 7:11 [PATCH 1/2] ipv4: spaces required around that '=' Chen Weilong
@ 2013-12-31 7:11 ` Chen Weilong
2014-01-02 8:31 ` David Miller
2014-01-02 8:31 ` [PATCH 1/2] ipv4: spaces required around that '=' David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Chen Weilong @ 2013-12-31 7:11 UTC (permalink / raw)
To: davem, kuznet, jmorris, yoshfuji, kaber; +Cc: netdev
From: Weilong Chen <chenweilong@huawei.com>
Signed-off-by: Weilong Chen <chenweilong@huawei.com>
---
net/ipv4/ip_options.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index dd9d90b..f4ab72e 100644
--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
@@ -275,7 +275,7 @@ int ip_options_compile(struct net *net,
for (l = opt->optlen; l > 0; ) {
switch (*optptr) {
- case IPOPT_END:
+ case IPOPT_END:
for (optptr++, l--; l > 0; optptr++, l--) {
if (*optptr != IPOPT_END) {
*optptr = IPOPT_END;
@@ -283,7 +283,7 @@ int ip_options_compile(struct net *net,
}
}
goto eol;
- case IPOPT_NOOP:
+ case IPOPT_NOOP:
l--;
optptr++;
continue;
@@ -294,8 +294,8 @@ int ip_options_compile(struct net *net,
goto error;
}
switch (*optptr) {
- case IPOPT_SSRR:
- case IPOPT_LSRR:
+ case IPOPT_SSRR:
+ case IPOPT_LSRR:
if (optlen < 3) {
pp_ptr = optptr + 1;
goto error;
@@ -321,7 +321,7 @@ int ip_options_compile(struct net *net,
opt->is_strictroute = (optptr[0] == IPOPT_SSRR);
opt->srr = optptr - iph;
break;
- case IPOPT_RR:
+ case IPOPT_RR:
if (opt->rr) {
pp_ptr = optptr;
goto error;
@@ -349,7 +349,7 @@ int ip_options_compile(struct net *net,
}
opt->rr = optptr - iph;
break;
- case IPOPT_TIMESTAMP:
+ case IPOPT_TIMESTAMP:
if (opt->ts) {
pp_ptr = optptr;
goto error;
@@ -369,13 +369,13 @@ int ip_options_compile(struct net *net,
goto error;
}
switch (optptr[3]&0xF) {
- case IPOPT_TS_TSONLY:
+ case IPOPT_TS_TSONLY:
if (skb)
timeptr = &optptr[optptr[2]-1];
opt->ts_needtime = 1;
optptr[2] += 4;
break;
- case IPOPT_TS_TSANDADDR:
+ case IPOPT_TS_TSANDADDR:
if (optptr[2]+7 > optptr[1]) {
pp_ptr = optptr + 2;
goto error;
@@ -389,7 +389,7 @@ int ip_options_compile(struct net *net,
opt->ts_needtime = 1;
optptr[2] += 8;
break;
- case IPOPT_TS_PRESPEC:
+ case IPOPT_TS_PRESPEC:
if (optptr[2]+7 > optptr[1]) {
pp_ptr = optptr + 2;
goto error;
@@ -405,7 +405,7 @@ int ip_options_compile(struct net *net,
opt->ts_needtime = 1;
optptr[2] += 8;
break;
- default:
+ default:
if (!skb && !ns_capable(net->user_ns, CAP_NET_RAW)) {
pp_ptr = optptr + 3;
goto error;
@@ -433,7 +433,7 @@ int ip_options_compile(struct net *net,
}
opt->ts = optptr - iph;
break;
- case IPOPT_RA:
+ case IPOPT_RA:
if (optlen < 4) {
pp_ptr = optptr + 1;
goto error;
@@ -441,7 +441,7 @@ int ip_options_compile(struct net *net,
if (optptr[2] == 0 && optptr[3] == 0)
opt->router_alert = optptr - iph;
break;
- case IPOPT_CIPSO:
+ case IPOPT_CIPSO:
if ((!skb && !ns_capable(net->user_ns, CAP_NET_RAW)) || opt->cipso) {
pp_ptr = optptr;
goto error;
@@ -452,9 +452,9 @@ int ip_options_compile(struct net *net,
goto error;
}
break;
- case IPOPT_SEC:
- case IPOPT_SID:
- default:
+ case IPOPT_SEC:
+ case IPOPT_SID:
+ default:
if (!skb && !ns_capable(net->user_ns, CAP_NET_RAW)) {
pp_ptr = optptr;
goto error;
--
1.7.12
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] ipv4: spaces required around that '='
2013-12-31 7:11 [PATCH 1/2] ipv4: spaces required around that '=' Chen Weilong
2013-12-31 7:11 ` [PATCH 2/2] ipv4: switch and case should be at the same indent Chen Weilong
@ 2014-01-02 8:31 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2014-01-02 8:31 UTC (permalink / raw)
To: chenweilong; +Cc: kuznet, jmorris, yoshfuji, kaber, netdev
From: Chen Weilong <chenweilong@huawei.com>
Date: Tue, 31 Dec 2013 15:11:27 +0800
> From: Weilong Chen <chenweilong@huawei.com>
>
>
> Signed-off-by: Weilong Chen <chenweilong@huawei.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] ipv4: switch and case should be at the same indent
2013-12-31 7:11 ` [PATCH 2/2] ipv4: switch and case should be at the same indent Chen Weilong
@ 2014-01-02 8:31 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2014-01-02 8:31 UTC (permalink / raw)
To: chenweilong; +Cc: kuznet, jmorris, yoshfuji, kaber, netdev
From: Chen Weilong <chenweilong@huawei.com>
Date: Tue, 31 Dec 2013 15:11:28 +0800
> From: Weilong Chen <chenweilong@huawei.com>
>
>
> Signed-off-by: Weilong Chen <chenweilong@huawei.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-01-02 8:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-12-31 7:11 [PATCH 1/2] ipv4: spaces required around that '=' Chen Weilong
2013-12-31 7:11 ` [PATCH 2/2] ipv4: switch and case should be at the same indent Chen Weilong
2014-01-02 8:31 ` David Miller
2014-01-02 8:31 ` [PATCH 1/2] ipv4: spaces required around that '=' David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).