mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
[IPV6]: ROUTE: Add accept_ra_rt_info_max_plen sysctl.
Signed-off-by: YOSHIFUJI Hideaki <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
e317da9622
commit
09c884d4c3
5 changed files with 36 additions and 1 deletions
|
|
@ -170,6 +170,9 @@ struct ipv6_devconf ipv6_devconf = {
|
|||
#ifdef CONFIG_IPV6_ROUTER_PREF
|
||||
.accept_ra_rtr_pref = 1,
|
||||
.rtr_probe_interval = 60 * HZ,
|
||||
#ifdef CONFIG_IPV6_ROUTE_INFO
|
||||
.accept_ra_rt_info_max_plen = 0,
|
||||
#endif
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
@ -197,6 +200,9 @@ static struct ipv6_devconf ipv6_devconf_dflt = {
|
|||
#ifdef CONFIG_IPV6_ROUTER_PREF
|
||||
.accept_ra_rtr_pref = 1,
|
||||
.rtr_probe_interval = 60 * HZ,
|
||||
#ifdef CONFIG_IPV6_ROUTE_INFO
|
||||
.accept_ra_rt_info_max_plen = 0,
|
||||
#endif
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
@ -3133,6 +3139,9 @@ static void inline ipv6_store_devconf(struct ipv6_devconf *cnf,
|
|||
#ifdef CONFIG_IPV6_ROUTER_PREF
|
||||
array[DEVCONF_ACCEPT_RA_RTR_PREF] = cnf->accept_ra_rtr_pref;
|
||||
array[DEVCONF_RTR_PROBE_INTERVAL] = cnf->rtr_probe_interval;
|
||||
#ifdef CONFIV_IPV6_ROUTE_INFO
|
||||
array[DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN] = cnf->accept_ra_rt_info_max_plen;
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -3620,6 +3629,16 @@ static struct addrconf_sysctl_table
|
|||
.proc_handler = &proc_dointvec_jiffies,
|
||||
.strategy = &sysctl_jiffies,
|
||||
},
|
||||
#ifdef CONFIV_IPV6_ROUTE_INFO
|
||||
{
|
||||
.ctl_name = NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN,
|
||||
.procname = "accept_ra_rt_info_max_plen",
|
||||
.data = &ipv6_devconf.accept_ra_rt_info_max_plen,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = &proc_dointvec,
|
||||
},
|
||||
#endif
|
||||
#endif
|
||||
{
|
||||
.ctl_name = 0, /* sentinel */
|
||||
|
|
|
|||
|
|
@ -1214,11 +1214,13 @@ skip_defrtr:
|
|||
}
|
||||
|
||||
#ifdef CONFIG_IPV6_ROUTE_INFO
|
||||
if (ndopts.nd_opts_ri) {
|
||||
if (in6_dev->cnf.accept_ra_rtr_pref && ndopts.nd_opts_ri) {
|
||||
struct nd_opt_hdr *p;
|
||||
for (p = ndopts.nd_opts_ri;
|
||||
p;
|
||||
p = ndisc_next_option(p, ndopts.nd_opts_ri_end)) {
|
||||
if (((struct route_info *)p)->prefix_len > in6_dev->cnf.accept_ra_rt_info_max_plen)
|
||||
continue;
|
||||
rt6_route_rcv(skb->dev, (u8*)p, (p->nd_opt_len) << 3,
|
||||
&skb->nh.ipv6h->saddr);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue