Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f81bd2e authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

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: default avatarCong Wang <amwang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 788787b5

include/net/addrconf.h

+15 −0
Original line number Diff line number Diff line
@@ -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

 */

net/ipv6/addrconf_core.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

net/ipv6/af_inet6.c

+11 −0
Original line number Diff line number Diff line
@@ -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();