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/tipc/socket.c | |
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/tipc/socket.c')
-rw-r--r-- | net/tipc/socket.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index eca5eb0dab08..1ea64f09cc45 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -1136,13 +1136,11 @@ restart: | |||
1136 | 1136 | ||
1137 | /* Loop around if more data is required */ | 1137 | /* Loop around if more data is required */ |
1138 | 1138 | ||
1139 | if ((sz_copied < buf_len) /* didn't get all requested data */ | 1139 | if ((sz_copied < buf_len) && /* didn't get all requested data */ |
1140 | && (!skb_queue_empty(&sk->sk_receive_queue) || | 1140 | (!skb_queue_empty(&sk->sk_receive_queue) || |
1141 | (flags & MSG_WAITALL)) | 1141 | (flags & MSG_WAITALL)) && /* and more is ready or required */ |
1142 | /* ... and more is ready or required */ | 1142 | (!(flags & MSG_PEEK)) && /* and aren't just peeking at data */ |
1143 | && (!(flags & MSG_PEEK)) /* ... and aren't just peeking at data */ | 1143 | (!err)) /* and haven't reached a FIN */ |
1144 | && (!err) /* ... and haven't reached a FIN */ | ||
1145 | ) | ||
1146 | goto restart; | 1144 | goto restart; |
1147 | 1145 | ||
1148 | exit: | 1146 | exit: |