diff options
author | Nathan Scott <nathans@bruce> | 2006-03-22 15:31:14 +1100 |
---|---|---|
committer | Nathan Scott <nathans@bruce> | 2006-03-22 15:31:14 +1100 |
commit | 4d74f423c722b8cadfabe087369200013b217b67 (patch) | |
tree | d62facddfdb0dfd89f3e61f4fc699cf2feb4b082 /include/linux/ipv6.h | |
parent | bb19fba1937cb6ab2bb98ac893365f6ebf88ef1b (diff) | |
parent | e952f31bce6e9f64db01f607abc46529ba57ac9e (diff) |
Merge HEAD from ../linux-2.6
Diffstat (limited to 'include/linux/ipv6.h')
-rw-r--r-- | include/linux/ipv6.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 9c8f4c9ed42..1263d8cb3c1 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -145,6 +145,15 @@ struct ipv6_devconf { __s32 max_desync_factor; #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; }; @@ -167,6 +176,11 @@ enum { DEVCONF_MAX_DESYNC_FACTOR, 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 }; |