summaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_input.c
diff options
context:
space:
mode:
authorIan Morris <ipm@chirality.org.uk>2014-11-23 22:28:43 +0100
committerDavid S. Miller <davem@davemloft.net>2014-11-24 03:00:56 +0100
commite5d08d718a7cd72c6aa79b5f0c309d9f0d7e4a95 (patch)
tree6b8beca04a01e147cf78284fef1e443e5df1f991 /net/ipv6/ip6_input.c
parentenic: use spin_lock(wq_lock) instead of spin_lock_irqsave(wq_lock) (diff)
downloadlinux-e5d08d718a7cd72c6aa79b5f0c309d9f0d7e4a95.tar.xz
linux-e5d08d718a7cd72c6aa79b5f0c309d9f0d7e4a95.zip
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.c3
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:
nexthdr = skb_network_header(skb)[nhoff];
raw = raw6_local_deliver(skb, nexthdr);
- if ((ipprot = rcu_dereference(inet6_protos[nexthdr])) != NULL) {
+ ipprot = rcu_dereference(inet6_protos[nexthdr]);
+ if (ipprot != NULL) {
int ret;
if (ipprot->flags & INET6_PROTO_FINAL) {