diff options
| author | Joe Perches <joe@perches.com> | 2009-11-29 16:55:45 -0800 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-29 16:55:45 -0800 | 
| commit | f64f9e719261a87818dd192a3a2352e5b20fbd0f (patch) | |
| tree | b2d5cbaef3df615295f6061d8c4d6a912690556c /net/packet/af_packet.c | |
| parent | 152b6a62aea2d43359dd37004e9c218bf7bdeb3b (diff) | |
| download | olio-linux-3.10-f64f9e719261a87818dd192a3a2352e5b20fbd0f.tar.xz olio-linux-3.10-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/packet/af_packet.c')
| -rw-r--r-- | net/packet/af_packet.c | 7 | 
1 files changed, 4 insertions, 3 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 940fc20b2b5..020562164b5 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1034,9 +1034,10 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)  			goto out_xmit;  		packet_increment_head(&po->tx_ring);  		len_sum += tp_len; -	} while (likely((ph != NULL) || ((!(msg->msg_flags & MSG_DONTWAIT)) -					&& (atomic_read(&po->tx_ring.pending)))) -	      ); +	} while (likely((ph != NULL) || +			((!(msg->msg_flags & MSG_DONTWAIT)) && +			 (atomic_read(&po->tx_ring.pending)))) +		);  	err = len_sum;  	goto out_put;  |