diff options
author | Vinod Koul <vkoul@kernel.org> | 2020-09-11 15:15:36 +0300 |
---|---|---|
committer | Vinod Koul <vkoul@kernel.org> | 2020-09-11 15:15:36 +0300 |
commit | 4c80e9323967125ab8aa7c271ccc7624abc08832 (patch) | |
tree | c9881b5814c184aa0c1cb58c6383beab9173e388 /net/ipv6/sysctl_net_ipv6.c | |
parent | ef759e4a28c88965972c815af6023f41bd733316 (diff) | |
parent | f4d51dffc6c01a9e94650d95ce0104964f8ae822 (diff) | |
download | linux-4c80e9323967125ab8aa7c271ccc7624abc08832.tar.xz |
Merge tag 'v5.9-rc4' into next
Linux 5.9-rc4
Diffstat (limited to 'net/ipv6/sysctl_net_ipv6.c')
-rw-r--r-- | net/ipv6/sysctl_net_ipv6.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c index fac2135aa47b..5b60a4bdd36a 100644 --- a/net/ipv6/sysctl_net_ipv6.c +++ b/net/ipv6/sysctl_net_ipv6.c @@ -21,6 +21,7 @@ #include <net/calipso.h> #endif +static int two = 2; static int flowlabel_reflect_max = 0x7; static int auto_flowlabels_min; static int auto_flowlabels_max = IP6_AUTO_FLOW_LABEL_MAX; @@ -150,7 +151,7 @@ static struct ctl_table ipv6_table_template[] = { .mode = 0644, .proc_handler = proc_rt6_multipath_hash_policy, .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE, + .extra2 = &two, }, { .procname = "seg6_flowlabel", |