diff options
| author | Joe Perches <joe@perches.com> | 2009-11-30 01:55:45 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-30 01:55:45 +0100 |
| commit | f64f9e719261a87818dd192a3a2352e5b20fbd0f (patch) | |
| tree | b2d5cbaef3df615295f6061d8c4d6a912690556c /net/tipc/socket.c | |
| parent | sfc: Separate shared NIC code from Falcon-specific and rename accordingly (diff) | |
| download | linux-f64f9e719261a87818dd192a3a2352e5b20fbd0f.tar.xz linux-f64f9e719261a87818dd192a3a2352e5b20fbd0f.zip | |
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: /* Loop around if more data is required */ - if ((sz_copied < buf_len) /* didn't get all requested data */ - && (!skb_queue_empty(&sk->sk_receive_queue) || - (flags & MSG_WAITALL)) - /* ... and more is ready or required */ - && (!(flags & MSG_PEEK)) /* ... and aren't just peeking at data */ - && (!err) /* ... and haven't reached a FIN */ - ) + if ((sz_copied < buf_len) && /* didn't get all requested data */ + (!skb_queue_empty(&sk->sk_receive_queue) || + (flags & MSG_WAITALL)) && /* and more is ready or required */ + (!(flags & MSG_PEEK)) && /* and aren't just peeking at data */ + (!err)) /* and haven't reached a FIN */ goto restart; exit: |