diff options
| author | Ian Morris <ipm@chirality.org.uk> | 2014-11-23 21:28:43 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-23 21:00:56 -0500 |
| commit | e5d08d718a7cd72c6aa79b5f0c309d9f0d7e4a95 (patch) | |
| tree | 6b8beca04a01e147cf78284fef1e443e5df1f991 /net/ipv6/udp.c | |
| parent | 78e2045d3d562e43562e3cbf0e96c26e38a718e9 (diff) | |
| download | op-kernel-dev-e5d08d718a7cd72c6aa79b5f0c309d9f0d7e4a95.zip op-kernel-dev-e5d08d718a7cd72c6aa79b5f0c309d9f0d7e4a95.tar.gz | |
ipv6: coding style improvements (remove assignment in if statements)
This change has no functional impact and simply addresses some coding
style issues detected by checkpatch. Specifically this change
adjusts "if" statements which also include the assignment of a
variable.
No changes to the resultant object files result as determined by objdiff.
Signed-off-by: Ian Morris <ipm@chirality.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 0ba3de4..dbc0b04 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -357,7 +357,8 @@ static struct sock *__udp6_lib_lookup_skb(struct sk_buff *skb, struct sock *sk; const struct ipv6hdr *iph = ipv6_hdr(skb); - if (unlikely(sk = skb_steal_sock(skb))) + sk = skb_steal_sock(skb); + if (unlikely(sk)) return sk; return __udp6_lib_lookup(dev_net(skb_dst(skb)->dev), &iph->saddr, sport, &iph->daddr, dport, inet6_iif(skb), @@ -1026,7 +1027,8 @@ static int udp_v6_push_pending_frames(struct sock *sk) fl6 = &inet->cork.fl.u.ip6; /* Grab the skbuff where UDP header space exists. */ - if ((skb = skb_peek(&sk->sk_write_queue)) == NULL) + skb = skb_peek(&sk->sk_write_queue); + if (skb == NULL) goto out; /* |
