aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/addrconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r--net/ipv6/addrconf.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 8a8895ef09a7..fbcdcc6ba93b 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -165,6 +165,7 @@ struct ipv6_devconf ipv6_devconf = {
165 .max_desync_factor = MAX_DESYNC_FACTOR, 165 .max_desync_factor = MAX_DESYNC_FACTOR,
166#endif 166#endif
167 .max_addresses = IPV6_MAX_ADDRESSES, 167 .max_addresses = IPV6_MAX_ADDRESSES,
168 .accept_ra_defrtr = 1,
168}; 169};
169 170
170static struct ipv6_devconf ipv6_devconf_dflt = { 171static struct ipv6_devconf ipv6_devconf_dflt = {
@@ -186,6 +187,7 @@ static struct ipv6_devconf ipv6_devconf_dflt = {
186 .max_desync_factor = MAX_DESYNC_FACTOR, 187 .max_desync_factor = MAX_DESYNC_FACTOR,
187#endif 188#endif
188 .max_addresses = IPV6_MAX_ADDRESSES, 189 .max_addresses = IPV6_MAX_ADDRESSES,
190 .accept_ra_defrtr = 1,
189}; 191};
190 192
191/* IPv6 Wildcard Address and Loopback Address defined by RFC2553 */ 193/* IPv6 Wildcard Address and Loopback Address defined by RFC2553 */
@@ -3116,6 +3118,7 @@ static void inline ipv6_store_devconf(struct ipv6_devconf *cnf,
3116 array[DEVCONF_MAX_DESYNC_FACTOR] = cnf->max_desync_factor; 3118 array[DEVCONF_MAX_DESYNC_FACTOR] = cnf->max_desync_factor;
3117#endif 3119#endif
3118 array[DEVCONF_MAX_ADDRESSES] = cnf->max_addresses; 3120 array[DEVCONF_MAX_ADDRESSES] = cnf->max_addresses;
3121 array[DEVCONF_ACCEPT_RA_DEFRTR] = cnf->accept_ra_defrtr;
3119} 3122}
3120 3123
3121static int inet6_fill_ifinfo(struct sk_buff *skb, struct inet6_dev *idev, 3124static int inet6_fill_ifinfo(struct sk_buff *skb, struct inet6_dev *idev,
@@ -3569,6 +3572,14 @@ static struct addrconf_sysctl_table
3569 .proc_handler = &proc_dointvec, 3572 .proc_handler = &proc_dointvec,
3570 }, 3573 },
3571 { 3574 {
3575 .ctl_name = NET_IPV6_ACCEPT_RA_DEFRTR,
3576 .procname = "accept_ra_defrtr",
3577 .data = &ipv6_devconf.accept_ra_defrtr,
3578 .maxlen = sizeof(int),
3579 .mode = 0644,
3580 .proc_handler = &proc_dointvec,
3581 },
3582 {
3572 .ctl_name = 0, /* sentinel */ 3583 .ctl_name = 0, /* sentinel */
3573 } 3584 }
3574 }, 3585 },