4 files changed, 19 insertions, 5 deletions

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 0e269038bb38..99e1ab7e3eec 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -383,6 +383,7 @@ struct raw6_sock {
         __u32                   checksum;       /* perform checksum */
         __u32                   offset;         /* checksum offset  */
         struct icmp6_filter     filter;
+        __u32                   ip6mr_table;
         /* ipv6_pinfo has to be the last member of raw6_sock, see inet6_sk_generic */
         struct ipv6_pinfo       inet6;
 };
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
index 0370dd4f2389..6091ab77f388 100644
--- a/include/linux/mroute6.h
+++ b/include/linux/mroute6.h
@@ -24,7 +24,8 @@
 #define MRT6_DEL_MFC    (MRT6_BASE+5)   /* Delete a multicast forwarding entry  */
 #define MRT6_VERSION    (MRT6_BASE+6)   /* Get the kernel multicast version     */
 #define MRT6_ASSERT     (MRT6_BASE+7)   /* Activate PIM assert mode             */
-#define MRT6_PIM        (MRT6_BASE+8)   /* enable PIM code      */
+#define MRT6_PIM        (MRT6_BASE+8)   /* enable PIM code                      */
+#define MRT6_TABLE      (MRT6_BASE+9)   /* Specify mroute table ID              */
 
 #define SIOCGETMIFCNT_IN6       SIOCPROTOPRIVATE        /* IP protocol privates */
 #define SIOCGETSGCNT_IN6        (SIOCPROTOPRIVATE+1)
@@ -229,11 +230,17 @@ extern int ip6mr_get_route(struct net *net, struct sk_buff *skb,
                            struct rtmsg *rtm, int nowait);
 
 #ifdef CONFIG_IPV6_MROUTE
-extern struct sock *mroute6_socket(struct net *net);
+extern struct sock *mroute6_socket(struct net *net, struct sk_buff *skb);
 extern int ip6mr_sk_done(struct sock *sk);
 #else
-static inline struct sock *mroute6_socket(struct net *net) { return NULL; }
-static inline int ip6mr_sk_done(struct sock *sk) { return 0; }
+static inline struct sock *mroute6_socket(struct net *net, struct sk_buff *skb)
+{
+        return NULL;
+}
+static inline int ip6mr_sk_done(struct sock *sk)
+{
+        return 0;
+}
 #endif
 #endif
 
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 5a42c36cb6aa..fbc8cb0d48c3 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -11,7 +11,8 @@
  * families, values above 128 may be used arbitrarily.
  */
 #define RTNL_FAMILY_IPMR                128
-#define RTNL_FAMILY_MAX                 128
+#define RTNL_FAMILY_IP6MR               129
+#define RTNL_FAMILY_MAX                 129
 
 /****
  *              Routing/neighbour discovery messages.
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 4e2780e6d8bc..81abfcb2eb4e 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -59,7 +59,12 @@ struct netns_ipv6 {
         struct sock             *tcp_sk;
         struct sock             *igmp_sk;
 #ifdef CONFIG_IPV6_MROUTE
+#ifndef CONFIG_IPV6_MROUTE_MULTIPLE_TABLES
         struct mr6_table        *mrt6;
+#else
+        struct list_head        mr6_tables;
+        struct fib_rules_ops    *mr6_rules_ops;
+#endif
 #endif
 };
 #endif