From: Cong Wang <amwang@redhat.com>
To: netdev@vger.kernel.org
Cc: "Ben Hutchings" <bhutchings@solarflare.com>,
"Bjørn Mork" <bjorn@mork.no>,
"Stephen Hemminger" <stephen@networkplumber.org>,
"David S. Miller" <davem@davemloft.net>,
"Cong Wang" <amwang@redhat.com>
Subject: [Patch net-next v7 2/6] ipv6: export a stub for ipv6_sock_mc_join and ipv6_sock_mc_drop
Date: Tue, 30 Apr 2013 16:43:11 +0800 [thread overview]
Message-ID: <1367311395-15891-3-git-send-email-amwang@redhat.com> (raw)
In-Reply-To: <1367311395-15891-1-git-send-email-amwang@redhat.com>
From: Cong Wang <amwang@redhat.com>
In case IPv6 is compiled as a module, introduce a stub
for ipv6_sock_mc_join and ipv6_sock_mc_drop. It will be used
by vxlan module. Suggested by Ben.
Cc: Ben Hutchings <bhutchings@solarflare.com>
Cc: Bjørn Mork <bjorn@mork.no>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
---
include/net/addrconf.h | 9 +++++++++
net/ipv6/addrconf_core.c | 3 +++
net/ipv6/mcast.c | 7 +++++++
3 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 84a6440..c82e00f 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -140,6 +140,15 @@ extern bool inet6_mc_check(struct sock *sk,
const struct in6_addr *mc_addr,
const struct in6_addr *src_addr);
+/* A stub used by vxlan module */
+struct ipv6_mcast_ops {
+ 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);
+};
+extern const struct ipv6_mcast_ops *ipv6_mcast_ops __read_mostly;
+
extern int ipv6_dev_mc_inc(struct net_device *dev, const struct in6_addr *addr);
extern int __ipv6_dev_mc_dec(struct inet6_dev *idev, const struct in6_addr *addr);
extern int ipv6_dev_mc_dec(struct net_device *dev, const struct in6_addr *addr);
diff --git a/net/ipv6/addrconf_core.c b/net/ipv6/addrconf_core.c
index 7210456..8c7cb63 100644
--- a/net/ipv6/addrconf_core.c
+++ b/net/ipv6/addrconf_core.c
@@ -97,3 +97,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_mcast_ops *ipv6_mcast_ops __read_mostly;
+EXPORT_SYMBOL_GPL(ipv6_mcast_ops);
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index bfa6cc3..cfa31d2 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -2665,12 +2665,19 @@ static struct pernet_operations igmp6_net_ops = {
.exit = igmp6_net_exit,
};
+static const struct ipv6_mcast_ops ipv6_mcast_ops_impl = {
+ .ipv6_sock_mc_join = ipv6_sock_mc_join,
+ .ipv6_sock_mc_drop = ipv6_sock_mc_drop,
+};
+
int __init igmp6_init(void)
{
+ ipv6_mcast_ops = &ipv6_mcast_ops_impl;
return register_pernet_subsys(&igmp6_net_ops);
}
void igmp6_cleanup(void)
{
+ ipv6_mcast_ops = NULL;
unregister_pernet_subsys(&igmp6_net_ops);
}
--
1.7.7.6
next prev parent reply other threads:[~2013-04-30 8:43 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-30 8:43 [Patch net-next v7 0/6] vxlan: add ipv6 support Cong Wang
2013-04-30 8:43 ` [Patch net-next v7 1/6] vxlan: defer vxlan init as late as possible Cong Wang
2013-04-30 8:43 ` Cong Wang [this message]
2013-04-30 8:43 ` [Patch net-next v7 3/6] ipv6: export in6addr_loopback to modules Cong Wang
2013-04-30 8:43 ` [Patch net-next v7 4/6] vxlan: add ipv6 support Cong Wang
2013-04-30 9:17 ` Bjørn Mork
2013-04-30 9:25 ` Cong Wang
2013-04-30 10:33 ` Bjørn Mork
2013-04-30 19:06 ` David Miller
2013-05-02 8:05 ` Cong Wang
2013-05-02 8:10 ` David Miller
2013-05-02 12:45 ` Bjørn Mork
2013-05-03 3:02 ` Cong Wang
2013-04-30 19:05 ` David Miller
2013-05-02 7:55 ` Cong Wang
2013-04-30 9:38 ` Cong Wang
2013-04-30 18:58 ` David Miller
2013-04-30 19:04 ` David Miller
2013-04-30 8:43 ` [Patch net-next v7 5/6] vxlan: respect disable_ipv6 sysctl Cong Wang
2013-04-30 12:27 ` Sergei Shtylyov
2013-04-30 8:43 ` [Patch net-next v7 6/6] ipv6: Add generic UDP Tunnel segmentation Cong Wang
2013-04-30 19:00 ` [Patch net-next v7 0/6] vxlan: add ipv6 support David Miller
2013-05-02 7:02 ` Cong Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1367311395-15891-3-git-send-email-amwang@redhat.com \
--to=amwang@redhat.com \
--cc=bhutchings@solarflare.com \
--cc=bjorn@mork.no \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).