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/phonet | |
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/phonet')
-rw-r--r-- | net/phonet/pep.c | 4 | ||||
-rw-r--r-- | net/phonet/socket.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/phonet/pep.c b/net/phonet/pep.c index bdc17bdad36..b6356f3832f 100644 --- a/net/phonet/pep.c +++ b/net/phonet/pep.c | |||
@@ -714,8 +714,8 @@ static int pep_ioctl(struct sock *sk, int cmd, unsigned long arg) | |||
714 | return -EINVAL; | 714 | return -EINVAL; |
715 | 715 | ||
716 | lock_sock(sk); | 716 | lock_sock(sk); |
717 | if (sock_flag(sk, SOCK_URGINLINE) | 717 | if (sock_flag(sk, SOCK_URGINLINE) && |
718 | && !skb_queue_empty(&pn->ctrlreq_queue)) | 718 | !skb_queue_empty(&pn->ctrlreq_queue)) |
719 | answ = skb_peek(&pn->ctrlreq_queue)->len; | 719 | answ = skb_peek(&pn->ctrlreq_queue)->len; |
720 | else if (!skb_queue_empty(&sk->sk_receive_queue)) | 720 | else if (!skb_queue_empty(&sk->sk_receive_queue)) |
721 | answ = skb_peek(&sk->sk_receive_queue)->len; | 721 | answ = skb_peek(&sk->sk_receive_queue)->len; |
diff --git a/net/phonet/socket.c b/net/phonet/socket.c index 4112b6e1c48..69c8b826a0c 100644 --- a/net/phonet/socket.c +++ b/net/phonet/socket.c | |||
@@ -98,8 +98,8 @@ struct sock *pn_find_sock_by_sa(struct net *net, const struct sockaddr_pn *spn) | |||
98 | if (pn->resource != res) | 98 | if (pn->resource != res) |
99 | continue; | 99 | continue; |
100 | } | 100 | } |
101 | if (pn_addr(pn->sobject) | 101 | if (pn_addr(pn->sobject) && |
102 | && pn_addr(pn->sobject) != pn_addr(obj)) | 102 | pn_addr(pn->sobject) != pn_addr(obj)) |
103 | continue; | 103 | continue; |
104 | 104 | ||
105 | rval = sknode; | 105 | rval = sknode; |