commit 856c470192bdf9670f612df4777b16b066ff05fe
author The Android Automerger <android-build@google.com> Wed May 14 05:51:42 2014 -0700
committer The Android Automerger <android-build@google.com> Wed May 14 05:51:42 2014 -0700
tree 8b3b241054d841bb3639a2b8bc89c919637d8087
parent 3c1c730f206d1d2dc25ac555d48513d6a3e5fb7f
parent 4ae3866b38abbc456ee77654d43332f6aa64ab1e

merge in master-release history after reset to 3c1c730f206d1d2dc25ac555d48513d6a3e5fb7f

adb/adb_auth_host.c

diff --git a/adb/adb_auth_host.c b/adb/adb_auth_host.c
index 9039d42..783774a 100644
--- a/adb/adb_auth_host.c
+++ b/adb/adb_auth_host.c
@@ -159,13 +159,13 @@
 
     bio = BIO_push(b64, bfile);
     BIO_write(bio, &pkey, sizeof(pkey));
-    BIO_flush(bio);
+    (void) BIO_flush(bio);
     BIO_pop(b64);
     BIO_free(b64);
 
     get_user_info(info, sizeof(info));
     BIO_write(bfile, info, strlen(info));
-    BIO_flush(bfile);
+    (void) BIO_flush(bfile);
     BIO_free_all(bfile);
 
     return 1;

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