ipv6: export a stub for IPv6 symbols used by vxlan

In case IPv6 is compiled as a module, introduce a stub
for ipv6_sock_mc_join and ipv6_sock_mc_drop etc.. It will be used
by vxlan module. Suggested by Ben.

This is an ugly but easy solution for now.

Cc: Ben Hutchings <bhutchings@solarflare.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 43fa31a610b81e9d7ae8677d58d34b431cd47576..5339cab356bb0c6543fdade38c822e7fdb6c7c58 100644 (file)
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -141,6 +141,21 @@ bool ipv6_chk_mcast_addr(struct net_device *dev, const struct in6_addr *group,
                         const struct in6_addr *src_addr);
 
 void ipv6_mc_dad_complete(struct inet6_dev *idev);
+
+/* A stub used by vxlan module. This is ugly, ideally these
+ * symbols should be built into the core kernel.
+ */
+struct ipv6_stub {
+       int (*ipv6_sock_mc_join)(struct sock *sk, int ifindex,
+                                const struct in6_addr *addr);
+       int (*ipv6_sock_mc_drop)(struct sock *sk, int ifindex,
+                                const struct in6_addr *addr);
+       int (*ipv6_dst_lookup)(struct sock *sk, struct dst_entry **dst,
+                               struct flowi6 *fl6);
+       void (*udpv6_encap_enable)(void);
+};
+extern const struct ipv6_stub *ipv6_stub __read_mostly;
+
 /*
  * identify MLD packets for MLD filter exceptions
  */

diff --git a/net/ipv6/addrconf_core.c b/net/ipv6/addrconf_core.c
index d2f87427244b2ccd00f754048e46d4882f77363d..93b24c6bcae761a05dfdce56a8b38bca4f8dcdb6 100644 (file)
--- a/net/ipv6/addrconf_core.c
+++ b/net/ipv6/addrconf_core.c
@@ -98,3 +98,6 @@ int inet6addr_notifier_call_chain(unsigned long val, void *v)
        return atomic_notifier_call_chain(&inet6addr_chain, val, v);
 }
 EXPORT_SYMBOL(inet6addr_notifier_call_chain);
+
+const struct ipv6_stub *ipv6_stub __read_mostly;
+EXPORT_SYMBOL_GPL(ipv6_stub);

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 0d1a9b153fbb8c82d680015d382429472d42cfcb..0c9c22f7487a0c5a1fec2ed4ab814b3e6e457603 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -810,6 +810,13 @@ static struct pernet_operations inet6_net_ops = {
        .exit = inet6_net_exit,
 };
 
+static const struct ipv6_stub ipv6_stub_impl = {
+       .ipv6_sock_mc_join = ipv6_sock_mc_join,
+       .ipv6_sock_mc_drop = ipv6_sock_mc_drop,
+       .ipv6_dst_lookup = ip6_dst_lookup,
+       .udpv6_encap_enable = udpv6_encap_enable,
+};
+
 static int __init inet6_init(void)
 {
        struct list_head *r;
@@ -884,6 +891,9 @@ static int __init inet6_init(void)
        err = igmp6_init();
        if (err)
                goto igmp_fail;
+
+       ipv6_stub = &ipv6_stub_impl;
+
        err = ipv6_netfilter_init();
        if (err)
                goto netfilter_fail;
@@ -1040,6 +1050,7 @@ static void __exit inet6_exit(void)
        raw6_proc_exit();
 #endif
        ipv6_netfilter_fini();
+       ipv6_stub = NULL;
        igmp6_cleanup();
        ndisc_cleanup();
        ip6_mr_cleanup();