commit 3c1c730f206d1d2dc25ac555d48513d6a3e5fb7f
author Sreeram Ramachandran <sreeram@google.com> Tue May 13 22:43:58 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 13 22:43:58 2014 +0000
tree 8b3b241054d841bb3639a2b8bc89c919637d8087
parent 910bca6850aea80bb4431aaccb2561730fe9741d
parent ca61b484b6eb1bf92b05bc5386668ec51999e55a

am ca61b484: am b8cfcf3d: am 32e4479d: Merge "Set kernel proc files for fwmark reflection and table numbers for RAs."

* commit 'ca61b484b6eb1bf92b05bc5386668ec51999e55a':
  Set kernel proc files for fwmark reflection and table numbers for RAs.

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index b0cd45a..833b96d 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -109,6 +109,13 @@
     write /proc/sys/kernel/sched_rt_runtime_us 950000
     write /proc/sys/kernel/sched_rt_period_us 1000000
 
+    # reflect fwmark from incoming packets onto generated replies
+    write /proc/sys/net/ipv4/fwmark_reflect 1
+    write /proc/sys/net/ipv6/fwmark_reflect 1
+
+    # set fwmark on accepted sockets
+    write /proc/sys/net/ipv4/tcp_fwmark_accept 1
+
 # Create cgroup mount points for process groups
     mkdir /dev/cpuctl
     mount cgroup none /dev/cpuctl cpu