aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWeilong Chen <chenweilong@huawei.com>2013-12-23 01:37:27 -0500
committerDavid S. Miller <davem@davemloft.net>2013-12-26 13:43:21 -0500
commit0c9a67d2ed028e0edd3260abafef4f1efd91aa5a (patch)
tree6e0f51d336a6f8e0add6a1c9df3dd721063a07a8
parenta22318e83bc4726252262f91b08f17d2d66bd88c (diff)
ipv4: fix checkpatch error "space prohibited"
Signed-off-by: Weilong Chen <chenweilong@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/inetpeer.c4
-rw-r--r--net/ipv4/netfilter/nf_nat_snmp_basic.c12
-rw-r--r--net/ipv4/syncookies.c2
-rw-r--r--net/ipv4/tcp_yeah.c4
4 files changed, 11 insertions, 11 deletions
diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
index 33d5537881ed..d047c8851714 100644
--- a/net/ipv4/inetpeer.c
+++ b/net/ipv4/inetpeer.c
@@ -227,7 +227,7 @@ static int addr_compare(const struct inetpeer_addr *a,
227 stackptr = _stack; \ 227 stackptr = _stack; \
228 *stackptr++ = &_base->root; \ 228 *stackptr++ = &_base->root; \
229 for (u = rcu_deref_locked(_base->root, _base); \ 229 for (u = rcu_deref_locked(_base->root, _base); \
230 u != peer_avl_empty; ) { \ 230 u != peer_avl_empty;) { \
231 int cmp = addr_compare(_daddr, &u->daddr); \ 231 int cmp = addr_compare(_daddr, &u->daddr); \
232 if (cmp == 0) \ 232 if (cmp == 0) \
233 break; \ 233 break; \
@@ -282,7 +282,7 @@ static struct inet_peer *lookup_rcu(const struct inetpeer_addr *daddr,
282 *stackptr++ = &start->avl_left; \ 282 *stackptr++ = &start->avl_left; \
283 v = &start->avl_left; \ 283 v = &start->avl_left; \
284 for (u = rcu_deref_locked(*v, base); \ 284 for (u = rcu_deref_locked(*v, base); \
285 u->avl_right != peer_avl_empty_rcu; ) { \ 285 u->avl_right != peer_avl_empty_rcu;) { \
286 v = &u->avl_right; \ 286 v = &u->avl_right; \
287 *stackptr++ = v; \ 287 *stackptr++ = v; \
288 u = rcu_deref_locked(*v, base); \ 288 u = rcu_deref_locked(*v, base); \
diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
index 61a942265e8a..d551e31b416e 100644
--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
+++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
@@ -461,14 +461,14 @@ static unsigned char asn1_oid_decode(struct asn1_ctx *ctx,
461 } 461 }
462 462
463 if (subid < 40) { 463 if (subid < 40) {
464 optr [0] = 0; 464 optr[0] = 0;
465 optr [1] = subid; 465 optr[1] = subid;
466 } else if (subid < 80) { 466 } else if (subid < 80) {
467 optr [0] = 1; 467 optr[0] = 1;
468 optr [1] = subid - 40; 468 optr[1] = subid - 40;
469 } else { 469 } else {
470 optr [0] = 2; 470 optr[0] = 2;
471 optr [1] = subid - 80; 471 optr[1] = subid - 80;
472 } 472 }
473 473
474 *len = 2; 474 *len = 2;
diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
index b95331e6c077..f2ed13c2125f 100644
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
@@ -121,7 +121,7 @@ static __u32 check_tcp_syn_cookie(__u32 cookie, __be32 saddr, __be32 daddr,
121 cookie -= cookie_hash(saddr, daddr, sport, dport, 0, 0) + sseq; 121 cookie -= cookie_hash(saddr, daddr, sport, dport, 0, 0) + sseq;
122 122
123 /* Cookie is now reduced to (count * 2^24) ^ (hash % 2^24) */ 123 /* Cookie is now reduced to (count * 2^24) ^ (hash % 2^24) */
124 diff = (count - (cookie >> COOKIEBITS)) & ((__u32) - 1 >> COOKIEBITS); 124 diff = (count - (cookie >> COOKIEBITS)) & ((__u32) -1 >> COOKIEBITS);
125 if (diff >= MAX_SYNCOOKIE_AGE) 125 if (diff >= MAX_SYNCOOKIE_AGE)
126 return (__u32)-1; 126 return (__u32)-1;
127 127
diff --git a/net/ipv4/tcp_yeah.c b/net/ipv4/tcp_yeah.c
index a347a078ee07..20cfaab12e15 100644
--- a/net/ipv4/tcp_yeah.c
+++ b/net/ipv4/tcp_yeah.c
@@ -214,9 +214,9 @@ static u32 tcp_yeah_ssthresh(struct sock *sk) {
214 if (yeah->doing_reno_now < TCP_YEAH_RHO) { 214 if (yeah->doing_reno_now < TCP_YEAH_RHO) {
215 reduction = yeah->lastQ; 215 reduction = yeah->lastQ;
216 216
217 reduction = min( reduction, max(tp->snd_cwnd>>1, 2U) ); 217 reduction = min(reduction, max(tp->snd_cwnd>>1, 2U));
218 218
219 reduction = max( reduction, tp->snd_cwnd >> TCP_YEAH_DELTA); 219 reduction = max(reduction, tp->snd_cwnd >> TCP_YEAH_DELTA);
220 } else 220 } else
221 reduction = max(tp->snd_cwnd>>1, 2U); 221 reduction = max(tp->snd_cwnd>>1, 2U);
222 222