Merge tag 'powerpc-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

[deliverable/linux.git] / net / ipv6 / ip6_input.c

diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index a3084ab5df6cd1b343af6d725975082f5c4b6eb6..aacdcb4dc7624117561ce9720fa4734ed06ce5a0 100644 (file)
--- 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) {