diff options
author | Ian Morris <ipm@chirality.org.uk> | 2014-11-23 16:28:43 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-23 21:00:56 -0500 |
commit | e5d08d718a7cd72c6aa79b5f0c309d9f0d7e4a95 (patch) | |
tree | 6b8beca04a01e147cf78284fef1e443e5df1f991 /net/ipv6/ip6_input.c | |
parent | 78e2045d3d562e43562e3cbf0e96c26e38a718e9 (diff) |
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/ip6_input.c')
-rw-r--r-- | net/ipv6/ip6_input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index a3084ab5df6c..aacdcb4dc762 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c | |||
@@ -220,7 +220,8 @@ resubmit: | |||
220 | nexthdr = skb_network_header(skb)[nhoff]; | 220 | nexthdr = skb_network_header(skb)[nhoff]; |
221 | 221 | ||
222 | raw = raw6_local_deliver(skb, nexthdr); | 222 | raw = raw6_local_deliver(skb, nexthdr); |
223 | if ((ipprot = rcu_dereference(inet6_protos[nexthdr])) != NULL) { | 223 | ipprot = rcu_dereference(inet6_protos[nexthdr]); |
224 | if (ipprot != NULL) { | ||
224 | int ret; | 225 | int ret; |
225 | 226 | ||
226 | if (ipprot->flags & INET6_PROTO_FINAL) { | 227 | if (ipprot->flags & INET6_PROTO_FINAL) { |