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/packet | |
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/packet')
-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 940fc20b2b50..020562164b56 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) | |||
1034 | goto out_xmit; | 1034 | goto out_xmit; |
1035 | packet_increment_head(&po->tx_ring); | 1035 | packet_increment_head(&po->tx_ring); |
1036 | len_sum += tp_len; | 1036 | len_sum += tp_len; |
1037 | } while (likely((ph != NULL) || ((!(msg->msg_flags & MSG_DONTWAIT)) | 1037 | } while (likely((ph != NULL) || |
1038 | && (atomic_read(&po->tx_ring.pending)))) | 1038 | ((!(msg->msg_flags & MSG_DONTWAIT)) && |
1039 | ); | 1039 | (atomic_read(&po->tx_ring.pending)))) |
1040 | ); | ||
1040 | 1041 | ||
1041 | err = len_sum; | 1042 | err = len_sum; |
1042 | goto out_put; | 1043 | goto out_put; |