Merge changes Ibec5b263,Iabe80f7e,I820fa224android-o-mr1-iot-release-1.0.12oreo-mr1-iot-release

* changes:
  net-test: leak_test fix a test name typo
  net-test: add CONFIG_WARN_ALL_UNSEEDED_RANDOM
  net-test: add CONFIG_PCI

2 files changed, 3 insertions, 2 deletions

diff --git a/net/test/leak_test.py b/net/test/leak_test.py
index 8ef4b41..4659046 100755
--- a/net/test/leak_test.py
+++ b/net/test/leak_test.py
@@ -76,7 +76,7 @@ class ForceSocketBufferOptionTest(net_test.NetworkTest):
   def testRcvBufForce(self):
     self.CheckForceSocketBufferOption(SO_RCVBUF, self.SO_RCVBUFFORCE)
 
-  def testRcvBufForce(self):
+  def testSndBufForce(self):
     self.CheckForceSocketBufferOption(SO_SNDBUF, self.SO_SNDBUFFORCE)
 
 
diff --git a/net/test/run_net_test.sh b/net/test/run_net_test.sh
index deed5cd..da9d243 100755
--- a/net/test/run_net_test.sh
+++ b/net/test/run_net_test.sh
@@ -13,6 +13,7 @@ EOF
 
 # Common kernel options
 OPTIONS=" DEBUG_SPINLOCK DEBUG_ATOMIC_SLEEP DEBUG_MUTEXES DEBUG_RT_MUTEXES"
+OPTIONS="$OPTIONS WARN_ALL_UNSEEDED_RANDOM"
 OPTIONS="$OPTIONS DEVTMPFS DEVTMPFS_MOUNT FHANDLE"
 OPTIONS="$OPTIONS IPV6 IPV6_ROUTER_PREF IPV6_MULTIPLE_TABLES IPV6_ROUTE_INFO"
 OPTIONS="$OPTIONS TUN SYN_COOKIES IP_ADVANCED_ROUTER IP_MULTIPLE_TABLES"
@@ -57,7 +58,7 @@ OPTIONS="$OPTIONS NETFILTER_TPROXY"              # Removed in 3.11
 OPTIONS="$OPTIONS BLK_DEV_UBD HOSTFS"
 
 # QEMU specific options
-OPTIONS="$OPTIONS VIRTIO VIRTIO_PCI VIRTIO_BLK NET_9P NET_9P_VIRTIO 9P_FS"
+OPTIONS="$OPTIONS PCI VIRTIO VIRTIO_PCI VIRTIO_BLK NET_9P NET_9P_VIRTIO 9P_FS"
 OPTIONS="$OPTIONS SERIAL_8250 SERIAL_8250_PCI"
 
 # Obsolete options present at some time in Android kernels