Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 93908d192686d8285dd6441ff855df92a40103d2

Authored by Thomas Graf
Committed by David S. Miller
1 parent d530db0db9
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ipv6: Expose IFLA_PROTINFO timer values in msecs instead of jiffies 

IFLA_PROTINFO exposes timer related per device settings in jiffies.
Change it to expose these values in msecs like the sysctl interface
does.

I did not find any users of IFLA_PROTINFO which rely on any of these
values and even if there are, they are likely already broken because
there is no way for them to reliably convert such a value to another
time format.

Signed-off-by: Thomas Graf <tgraf@infradead.org>
Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 6 additions and 3 deletions Side-by-side Diff

... ... @@ -3798,8 +3798,10 @@
3798 3798 array[DEVCONF_AUTOCONF] = cnf->autoconf;
3799 3799 array[DEVCONF_DAD_TRANSMITS] = cnf->dad_transmits;
3800 3800 array[DEVCONF_RTR_SOLICITS] = cnf->rtr_solicits;
3801   - array[DEVCONF_RTR_SOLICIT_INTERVAL] = cnf->rtr_solicit_interval;
3802   - array[DEVCONF_RTR_SOLICIT_DELAY] = cnf->rtr_solicit_delay;
  3801 + array[DEVCONF_RTR_SOLICIT_INTERVAL] =
  3802 + jiffies_to_msecs(cnf->rtr_solicit_interval);
  3803 + array[DEVCONF_RTR_SOLICIT_DELAY] =
  3804 + jiffies_to_msecs(cnf->rtr_solicit_delay);
3803 3805 array[DEVCONF_FORCE_MLD_VERSION] = cnf->force_mld_version;
3804 3806 #ifdef CONFIG_IPV6_PRIVACY
3805 3807 array[DEVCONF_USE_TEMPADDR] = cnf->use_tempaddr;
... ... @@ -3813,7 +3815,8 @@
3813 3815 array[DEVCONF_ACCEPT_RA_PINFO] = cnf->accept_ra_pinfo;
3814 3816 #ifdef CONFIG_IPV6_ROUTER_PREF
3815 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 3820 #ifdef CONFIG_IPV6_ROUTE_INFO
3818 3821 array[DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN] = cnf->accept_ra_rt_info_max_plen;
3819 3822 #endif