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/rds/iw_recv.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/rds/iw_recv.c')
| -rw-r--r-- | net/rds/iw_recv.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c index 24fc53f03833..54af7d6b92da 100644 --- a/net/rds/iw_recv.c +++ b/net/rds/iw_recv.c @@ -230,8 +230,8 @@ int rds_iw_recv_refill(struct rds_connection *conn, gfp_t kptr_gfp, int ret = 0; u32 pos; - while ((prefill || rds_conn_up(conn)) - && rds_iw_ring_alloc(&ic->i_recv_ring, 1, &pos)) { + while ((prefill || rds_conn_up(conn)) && + rds_iw_ring_alloc(&ic->i_recv_ring, 1, &pos)) { if (pos >= ic->i_recv_ring.w_nr) { printk(KERN_NOTICE "Argh - ring alloc returned pos=%u\n", pos); @@ -730,10 +730,10 @@ static void rds_iw_process_recv(struct rds_connection *conn, hdr = &iwinc->ii_inc.i_hdr; /* We can't just use memcmp here; fragments of a * single message may carry different ACKs */ - if (hdr->h_sequence != ihdr->h_sequence - || hdr->h_len != ihdr->h_len - || hdr->h_sport != ihdr->h_sport - || hdr->h_dport != ihdr->h_dport) { + if (hdr->h_sequence != ihdr->h_sequence || + hdr->h_len != ihdr->h_len || + hdr->h_sport != ihdr->h_sport || + hdr->h_dport != ihdr->h_dport) { rds_iw_conn_error(conn, "fragment header mismatch; forcing reconnect\n"); return; |