diff options
author | Joe Perches <joe@perches.com> | 2009-11-29 19:55:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-29 19:55:45 -0500 |
commit | f64f9e719261a87818dd192a3a2352e5b20fbd0f (patch) | |
tree | b2d5cbaef3df615295f6061d8c4d6a912690556c /net/sctp | |
parent | 152b6a62aea2d43359dd37004e9c218bf7bdeb3b (diff) |
net: Move && and || to end of previous line
Not including net/atm/
Compiled tested x86 allyesconfig only
Added a > 80 column line or two, which I ignored.
Existing checkpatch plaints willfully, cheerfully ignored.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
-rw-r--r-- | net/sctp/outqueue.c | 4 | ||||
-rw-r--r-- | net/sctp/socket.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index e231a9831016..229690f02a1d 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c | |||
@@ -191,8 +191,8 @@ static inline int sctp_cacc_skip(struct sctp_transport *primary, | |||
191 | __u32 tsn) | 191 | __u32 tsn) |
192 | { | 192 | { |
193 | if (primary->cacc.changeover_active && | 193 | if (primary->cacc.changeover_active && |
194 | (sctp_cacc_skip_3_1(primary, transport, count_of_newacks) | 194 | (sctp_cacc_skip_3_1(primary, transport, count_of_newacks) || |
195 | || sctp_cacc_skip_3_2(primary, tsn))) | 195 | sctp_cacc_skip_3_2(primary, tsn))) |
196 | return 1; | 196 | return 1; |
197 | return 0; | 197 | return 0; |
198 | } | 198 | } |
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 71513b3926a5..5fa9ac52e137 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
@@ -2356,8 +2356,8 @@ static int sctp_setsockopt_peer_addr_params(struct sock *sk, | |||
2356 | pmtud_change == SPP_PMTUD || | 2356 | pmtud_change == SPP_PMTUD || |
2357 | sackdelay_change == SPP_SACKDELAY || | 2357 | sackdelay_change == SPP_SACKDELAY || |
2358 | params.spp_sackdelay > 500 || | 2358 | params.spp_sackdelay > 500 || |
2359 | (params.spp_pathmtu | 2359 | (params.spp_pathmtu && |
2360 | && params.spp_pathmtu < SCTP_DEFAULT_MINSEGMENT)) | 2360 | params.spp_pathmtu < SCTP_DEFAULT_MINSEGMENT)) |
2361 | return -EINVAL; | 2361 | return -EINVAL; |
2362 | 2362 | ||
2363 | /* If an address other than INADDR_ANY is specified, and | 2363 | /* If an address other than INADDR_ANY is specified, and |