Merge tag 'linux-can-next-for-4.2-20150609' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / net / ipv6 / sysctl_net_ipv6.c

diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index abcc79f..4e705ad 100644 (file)
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -68,6 +68,13 @@ static struct ctl_table ipv6_table_template[] = {
                .mode           = 0644,
                .proc_handler   = proc_dointvec_jiffies,
        },
+       {
+               .procname       = "flowlabel_state_ranges",
+               .data           = &init_net.ipv6.sysctl.flowlabel_state_ranges,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = proc_dointvec
+       },
        { }
 };
 
@@ -109,6 +116,7 @@ static int __net_init ipv6_sysctl_net_init(struct net *net)
        ipv6_table[4].data = &net->ipv6.sysctl.fwmark_reflect;
        ipv6_table[5].data = &net->ipv6.sysctl.idgen_retries;
        ipv6_table[6].data = &net->ipv6.sysctl.idgen_delay;
+       ipv6_table[7].data = &net->ipv6.sysctl.flowlabel_state_ranges;
 
        ipv6_route_table = ipv6_route_sysctl_init(net);
        if (!ipv6_route_table)