aboutsummaryrefslogtreecommitdiff
path: root/net/ipv6/sysctl_net_ipv6.c
diff options
context:
space:
mode:
authorThomas Wendt <thoemy@gmx.net>2014-11-12 23:20:34 +0100
committerZips <hcolmenares@gmail.com>2014-11-13 13:53:12 -0500
commit78d665cd45336f49cdb9361d97bf4e9e351da5f5 (patch)
tree8e95eb90174c8925f625efd477a9eaa6126c9235 /net/ipv6/sysctl_net_ipv6.c
parent1f1c4b90a5edd4c803f7520665569bc1191278d2 (diff)
Merge tag 'android-5.0.0_r0.6' into aicplp5.0
Android 5.0.0 Release 0.6 Change-Id: I1f0e5fc82aa17b23a414422e3e2851724a2d8e40
Diffstat (limited to 'net/ipv6/sysctl_net_ipv6.c')
-rw-r--r--net/ipv6/sysctl_net_ipv6.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index 6dcf5e7d661..4c27009d39e 100644
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -47,6 +47,13 @@ static ctl_table ipv6_table_template[] = {
.mode = 0644,
.proc_handler = proc_dointvec
},
+ {
+ .procname = "fwmark_reflect",
+ .data = &init_net.ipv6.sysctl.fwmark_reflect,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = proc_dointvec
+ },
{ }
};