diff options
author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2012-12-03 20:13:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-12-04 13:08:10 -0500 |
commit | d67b8c616b48df30e2836d797795f2420d109bc9 (patch) | |
tree | e06b3f77e905e789def714958fcd455c8b3c037b /include | |
parent | e8ad1a8fab6f550aba1f1fe7ba26749ff5460751 (diff) |
netconf: advertise mc_forwarding status
This patch advertise the MC_FORWARDING status for IPv4 and IPv6.
This field is readonly, only multicast engine in the kernel updates it.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/inetdevice.h | 3 | ||||
-rw-r--r-- | include/net/addrconf.h | 3 | ||||
-rw-r--r-- | include/uapi/linux/netconf.h | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h index d032780d0ce5..a9d828976a77 100644 --- a/include/linux/inetdevice.h +++ b/include/linux/inetdevice.h | |||
@@ -171,6 +171,9 @@ struct in_ifaddr { | |||
171 | extern int register_inetaddr_notifier(struct notifier_block *nb); | 171 | extern int register_inetaddr_notifier(struct notifier_block *nb); |
172 | extern int unregister_inetaddr_notifier(struct notifier_block *nb); | 172 | extern int unregister_inetaddr_notifier(struct notifier_block *nb); |
173 | 173 | ||
174 | extern void inet_netconf_notify_devconf(struct net *net, int type, int ifindex, | ||
175 | struct ipv4_devconf *devconf); | ||
176 | |||
174 | extern struct net_device *__ip_dev_find(struct net *net, __be32 addr, bool devref); | 177 | extern struct net_device *__ip_dev_find(struct net *net, __be32 addr, bool devref); |
175 | static inline struct net_device *ip_dev_find(struct net *net, __be32 addr) | 178 | static inline struct net_device *ip_dev_find(struct net *net, __be32 addr) |
176 | { | 179 | { |
diff --git a/include/net/addrconf.h b/include/net/addrconf.h index 9e63e76b20e7..df4ef9453384 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h | |||
@@ -172,6 +172,9 @@ extern bool ipv6_chk_acast_addr(struct net *net, struct net_device *dev, | |||
172 | extern int register_inet6addr_notifier(struct notifier_block *nb); | 172 | extern int register_inet6addr_notifier(struct notifier_block *nb); |
173 | extern int unregister_inet6addr_notifier(struct notifier_block *nb); | 173 | extern int unregister_inet6addr_notifier(struct notifier_block *nb); |
174 | 174 | ||
175 | extern void inet6_netconf_notify_devconf(struct net *net, int type, int ifindex, | ||
176 | struct ipv6_devconf *devconf); | ||
177 | |||
175 | /** | 178 | /** |
176 | * __in6_dev_get - get inet6_dev pointer from netdevice | 179 | * __in6_dev_get - get inet6_dev pointer from netdevice |
177 | * @dev: network device | 180 | * @dev: network device |
diff --git a/include/uapi/linux/netconf.h b/include/uapi/linux/netconf.h index 75dcbc587fb5..64804a798b0c 100644 --- a/include/uapi/linux/netconf.h +++ b/include/uapi/linux/netconf.h | |||
@@ -13,6 +13,7 @@ enum { | |||
13 | NETCONFA_IFINDEX, | 13 | NETCONFA_IFINDEX, |
14 | NETCONFA_FORWARDING, | 14 | NETCONFA_FORWARDING, |
15 | NETCONFA_RP_FILTER, | 15 | NETCONFA_RP_FILTER, |
16 | NETCONFA_MC_FORWARDING, | ||
16 | __NETCONFA_MAX | 17 | __NETCONFA_MAX |
17 | }; | 18 | }; |
18 | #define NETCONFA_MAX (__NETCONFA_MAX - 1) | 19 | #define NETCONFA_MAX (__NETCONFA_MAX - 1) |