Merge "sysctl: promote secondary ip addrs"
diff --git a/fs/skeleton/etc/init.d/S01sysctl.platform_gfibertv b/fs/skeleton/etc/init.d/S01sysctl.platform_gfibertv
index 14805a1..75336ca 100755
--- a/fs/skeleton/etc/init.d/S01sysctl.platform_gfibertv
+++ b/fs/skeleton/etc/init.d/S01sysctl.platform_gfibertv
@@ -11,6 +11,10 @@
# blocksize from the streamer.
# wmem_max defines the maximum send socket buffer size in bytes.
sysctl net.core.wmem_max=1572864
+ # Don't delete secondary addresses on an interface when deleting primary
+ # addresses. Fixes b/33548012.
+ sysctl net.ipv4.conf.default.promote_secondaries=1
+ sysctl net.ipv4.conf.all.promote_secondaries=1
# Panic everytime there is a kernel oops
sysctl -q kernel.panic_on_oops=1
;;
