diff options
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r-- | net/ipv6/addrconf.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index b41ce0f0d514..52b7df74e4c7 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -3798,8 +3798,10 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, | |||
3798 | array[DEVCONF_AUTOCONF] = cnf->autoconf; | 3798 | array[DEVCONF_AUTOCONF] = cnf->autoconf; |
3799 | array[DEVCONF_DAD_TRANSMITS] = cnf->dad_transmits; | 3799 | array[DEVCONF_DAD_TRANSMITS] = cnf->dad_transmits; |
3800 | array[DEVCONF_RTR_SOLICITS] = cnf->rtr_solicits; | 3800 | array[DEVCONF_RTR_SOLICITS] = cnf->rtr_solicits; |
3801 | array[DEVCONF_RTR_SOLICIT_INTERVAL] = cnf->rtr_solicit_interval; | 3801 | array[DEVCONF_RTR_SOLICIT_INTERVAL] = |
3802 | array[DEVCONF_RTR_SOLICIT_DELAY] = cnf->rtr_solicit_delay; | 3802 | jiffies_to_msecs(cnf->rtr_solicit_interval); |
3803 | array[DEVCONF_RTR_SOLICIT_DELAY] = | ||
3804 | jiffies_to_msecs(cnf->rtr_solicit_delay); | ||
3803 | array[DEVCONF_FORCE_MLD_VERSION] = cnf->force_mld_version; | 3805 | array[DEVCONF_FORCE_MLD_VERSION] = cnf->force_mld_version; |
3804 | #ifdef CONFIG_IPV6_PRIVACY | 3806 | #ifdef CONFIG_IPV6_PRIVACY |
3805 | array[DEVCONF_USE_TEMPADDR] = cnf->use_tempaddr; | 3807 | array[DEVCONF_USE_TEMPADDR] = cnf->use_tempaddr; |
@@ -3813,7 +3815,8 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, | |||
3813 | array[DEVCONF_ACCEPT_RA_PINFO] = cnf->accept_ra_pinfo; | 3815 | array[DEVCONF_ACCEPT_RA_PINFO] = cnf->accept_ra_pinfo; |
3814 | #ifdef CONFIG_IPV6_ROUTER_PREF | 3816 | #ifdef CONFIG_IPV6_ROUTER_PREF |
3815 | array[DEVCONF_ACCEPT_RA_RTR_PREF] = cnf->accept_ra_rtr_pref; | 3817 | array[DEVCONF_ACCEPT_RA_RTR_PREF] = cnf->accept_ra_rtr_pref; |
3816 | array[DEVCONF_RTR_PROBE_INTERVAL] = cnf->rtr_probe_interval; | 3818 | array[DEVCONF_RTR_PROBE_INTERVAL] = |
3819 | jiffies_to_msecs(cnf->rtr_probe_interval); | ||
3817 | #ifdef CONFIG_IPV6_ROUTE_INFO | 3820 | #ifdef CONFIG_IPV6_ROUTE_INFO |
3818 | array[DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN] = cnf->accept_ra_rt_info_max_plen; | 3821 | array[DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN] = cnf->accept_ra_rt_info_max_plen; |
3819 | #endif | 3822 | #endif |