1 files changed, 3 insertions, 6 deletions

diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index 79610b4bad3e..178aebc0427a 100644
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -153,9 +153,8 @@ out:
 static int ip6_input_finish(struct sk_buff *skb)
 {
         struct inet6_protocol *ipprot;
-        struct sock *raw_sk;
         unsigned int nhoff;
-        int nexthdr;
+        int nexthdr, raw;
         u8 hash;
         struct inet6_dev *idev;
 
@@ -171,9 +170,7 @@ resubmit:
         nhoff = IP6CB(skb)->nhoff;
         nexthdr = skb_network_header(skb)[nhoff];
 
-        raw_sk = sk_head(&raw_v6_htable[nexthdr & (MAX_INET_PROTOS - 1)]);
-        if (raw_sk && !ipv6_raw_deliver(skb, nexthdr))
-                raw_sk = NULL;
+        raw = raw6_local_deliver(skb, nexthdr);
 
         hash = nexthdr & (MAX_INET_PROTOS - 1);
         if ((ipprot = rcu_dereference(inet6_protos[hash])) != NULL) {
@@ -206,7 +203,7 @@ resubmit:
                 else if (ret == 0)
                         IP6_INC_STATS_BH(idev, IPSTATS_MIB_INDELIVERS);
         } else {
-                if (!raw_sk) {
+                if (!raw) {
                         if (xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) {
                                 IP6_INC_STATS_BH(idev, IPSTATS_MIB_INUNKNOWNPROTOS);
                                 icmpv6_send(skb, ICMPV6_PARAMPROB,