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/phonet | |
| 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/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 bdc17bdad366..b6356f3832f6 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) return -EINVAL; lock_sock(sk); - if (sock_flag(sk, SOCK_URGINLINE) - && !skb_queue_empty(&pn->ctrlreq_queue)) + if (sock_flag(sk, SOCK_URGINLINE) && + !skb_queue_empty(&pn->ctrlreq_queue)) answ = skb_peek(&pn->ctrlreq_queue)->len; else if (!skb_queue_empty(&sk->sk_receive_queue)) answ = skb_peek(&sk->sk_receive_queue)->len; diff --git a/net/phonet/socket.c b/net/phonet/socket.c index 4112b6e1c48a..69c8b826a0ce 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) if (pn->resource != res) continue; } - if (pn_addr(pn->sobject) - && pn_addr(pn->sobject) != pn_addr(obj)) + if (pn_addr(pn->sobject) && + pn_addr(pn->sobject) != pn_addr(obj)) continue; rval = sknode; |