[IPV6] MROUTE: Adjust IPV6 multicast routing module to use mroute6 header declarations.

[linux-2.6] / net / ipv6 / raw.c

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index c1e495f105ada25bdc43977b7edea7c72dd2ff75..088b80b4ce74774dde1c2b5b83dd91f1f99b0684 100644 (file)
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -53,6 +53,7 @@
 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
 #include <net/mip6.h>
 #endif
+#include <linux/mroute6.h>
 
 #include <net/raw.h>
 #include <net/rawv6.h>
@@ -168,11 +169,6 @@ static int ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)
        read_lock(&raw_v6_hashinfo.lock);
        sk = sk_head(&raw_v6_hashinfo.ht[hash]);
 
-       /*
-        *      The first socket found will be delivered after
-        *      delivery to transport protocols.
-        */
-
        if (sk == NULL)
                goto out;
 
@@ -1140,7 +1136,11 @@ static int rawv6_ioctl(struct sock *sk, int cmd, unsigned long arg)
                }
 
                default:
+#ifdef CONFIG_IPV6_MROUTE
+                       return ip6mr_ioctl(sk, cmd, (void __user *)arg);
+#else
                        return -ENOIOCTLCMD;
+#endif
        }
 }
 
@@ -1148,7 +1148,7 @@ static void rawv6_close(struct sock *sk, long timeout)
 {
        if (inet_sk(sk)->num == IPPROTO_RAW)
                ip6_ra_control(sk, -1, NULL);
-
+       ip6mr_sk_done(sk);
        sk_common_release(sk);
 }