Merge HEAD from ../linux-2.6

[powerpc.git] / include / linux / ipv6.h

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index c5131a0..1263d8c 100644 (file)
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -146,6 +146,14 @@ struct ipv6_devconf {
 #endif
        __s32           max_addresses;
        __s32           accept_ra_defrtr;
+       __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;
 };
 
@@ -169,6 +177,10 @@ enum {
        DEVCONF_MAX_ADDRESSES,
        DEVCONF_FORCE_MLD_VERSION,
        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
 };