Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6] / include / linux / ipv6.h

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 108b75dccd9ffc57f20279adadb17eef166c535a..1263d8cb3c18db024e6c4313764ce7f9e6f5c24a 100644 (file)
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -149,6 +149,10 @@ struct ipv6_devconf {
        __s32           accept_ra_pinfo;
 #ifdef CONFIG_IPV6_ROUTER_PREF
        __s32           accept_ra_rtr_pref;
+       __s32           rtr_probe_interval;
+#ifdef CONFIG_IPV6_ROUTE_INFO
+       __s32           accept_ra_rt_info_max_plen;
+#endif
 #endif
        void            *sysctl;
 };
@@ -175,6 +179,8 @@ enum {
        DEVCONF_ACCEPT_RA_DEFRTR,
        DEVCONF_ACCEPT_RA_PINFO,
        DEVCONF_ACCEPT_RA_RTR_PREF,
+       DEVCONF_RTR_PROBE_INTERVAL,
+       DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN,
        DEVCONF_MAX
 };