redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

ipv4: switch and case should be at the same indent

Browse source 
Signed-off-by: Weilong Chen <chenweilong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Weilong Chen 2013-12-31 15:11:28 +08:00 committed by David S. Miller
parent 442c67f844
commit dd9b45598a
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
net/ipv4/ip_options.c
View file

@ -275,7 +275,7 @@ int ip_options_compile(struct net *net,
for (l = opt->optlen; l > 0; ) { for (l = opt->optlen; l > 0; ) {
switch (*optptr) { switch (*optptr) {
case IPOPT_END: case IPOPT_END:
for (optptr++, l--; l > 0; optptr++, l--) { for (optptr++, l--; l > 0; optptr++, l--) {
if (*optptr != IPOPT_END) { if (*optptr != IPOPT_END) {
*optptr = IPOPT_END; *optptr = IPOPT_END;
@ -283,7 +283,7 @@ int ip_options_compile(struct net *net,
} }
} }
goto eol; goto eol;
case IPOPT_NOOP: case IPOPT_NOOP:
l--; l--;
optptr++; optptr++;
continue; continue;
@ -294,8 +294,8 @@ int ip_options_compile(struct net *net,
goto error; goto error;
} }
switch (*optptr) { switch (*optptr) {
case IPOPT_SSRR: case IPOPT_SSRR:
case IPOPT_LSRR: case IPOPT_LSRR:
if (optlen < 3) { if (optlen < 3) {
pp_ptr = optptr + 1; pp_ptr = optptr + 1;
goto error; goto error;
@ -321,7 +321,7 @@ int ip_options_compile(struct net *net,
opt->is_strictroute = (optptr[0] == IPOPT_SSRR); opt->is_strictroute = (optptr[0] == IPOPT_SSRR);
opt->srr = optptr - iph; opt->srr = optptr - iph;
break; break;
case IPOPT_RR: case IPOPT_RR:
if (opt->rr) { if (opt->rr) {
pp_ptr = optptr; pp_ptr = optptr;
goto error; goto error;
@ -349,7 +349,7 @@ int ip_options_compile(struct net *net,
} }
opt->rr = optptr - iph; opt->rr = optptr - iph;
break; break;
case IPOPT_TIMESTAMP: case IPOPT_TIMESTAMP:
if (opt->ts) { if (opt->ts) {
pp_ptr = optptr; pp_ptr = optptr;
goto error; goto error;
@ -369,13 +369,13 @@ int ip_options_compile(struct net *net,
goto error; goto error;
} }
switch (optptr[3]&0xF) { switch (optptr[3]&0xF) {
case IPOPT_TS_TSONLY: case IPOPT_TS_TSONLY:
if (skb) if (skb)
timeptr = &optptr[optptr[2]-1]; timeptr = &optptr[optptr[2]-1];
opt->ts_needtime = 1; opt->ts_needtime = 1;
optptr[2] += 4; optptr[2] += 4;
break; break;
case IPOPT_TS_TSANDADDR: case IPOPT_TS_TSANDADDR:
if (optptr[2]+7 > optptr[1]) { if (optptr[2]+7 > optptr[1]) {
pp_ptr = optptr + 2; pp_ptr = optptr + 2;
goto error; goto error;
@ -389,7 +389,7 @@ int ip_options_compile(struct net *net,
opt->ts_needtime = 1; opt->ts_needtime = 1;
optptr[2] += 8; optptr[2] += 8;
break; break;
case IPOPT_TS_PRESPEC: case IPOPT_TS_PRESPEC:
if (optptr[2]+7 > optptr[1]) { if (optptr[2]+7 > optptr[1]) {
pp_ptr = optptr + 2; pp_ptr = optptr + 2;
goto error; goto error;
@ -405,7 +405,7 @@ int ip_options_compile(struct net *net,
opt->ts_needtime = 1; opt->ts_needtime = 1;
optptr[2] += 8; optptr[2] += 8;
break; break;
default: default:
if (!skb && !ns_capable(net->user_ns, CAP_NET_RAW)) { if (!skb && !ns_capable(net->user_ns, CAP_NET_RAW)) {
pp_ptr = optptr + 3; pp_ptr = optptr + 3;
goto error; goto error;
@ -433,7 +433,7 @@ int ip_options_compile(struct net *net,
} }
opt->ts = optptr - iph; opt->ts = optptr - iph;
break; break;
case IPOPT_RA: case IPOPT_RA:
if (optlen < 4) { if (optlen < 4) {
pp_ptr = optptr + 1; pp_ptr = optptr + 1;
goto error; goto error;
@ -441,7 +441,7 @@ int ip_options_compile(struct net *net,
if (optptr[2] == 0 && optptr[3] == 0) if (optptr[2] == 0 && optptr[3] == 0)
opt->router_alert = optptr - iph; opt->router_alert = optptr - iph;
break; break;
case IPOPT_CIPSO: case IPOPT_CIPSO:
if ((!skb && !ns_capable(net->user_ns, CAP_NET_RAW)) || opt->cipso) { if ((!skb && !ns_capable(net->user_ns, CAP_NET_RAW)) || opt->cipso) {
pp_ptr = optptr; pp_ptr = optptr;
goto error; goto error;
@ -452,9 +452,9 @@ int ip_options_compile(struct net *net,
goto error; goto error;
} }
break; break;
case IPOPT_SEC: case IPOPT_SEC:
case IPOPT_SID: case IPOPT_SID:
default: default:
if (!skb && !ns_capable(net->user_ns, CAP_NET_RAW)) { if (!skb && !ns_capable(net->user_ns, CAP_NET_RAW)) {
pp_ptr = optptr; pp_ptr = optptr;
goto error; goto error;