tests: Make hostapd test setup more similar to the P2P tests

Signed-hostap: Jouni Malinen <j@w1.fi>

diff --git a/tests/hwsim/run-ap-tests.py b/tests/hwsim/run-ap-tests.py
index b3f02fce49670411801180f32c9b5cfb68f50c3d..14eab10c8865fb602558b394f83da8404d4dcd44 100755 (executable)
--- a/tests/hwsim/run-ap-tests.py
+++ b/tests/hwsim/run-ap-tests.py
@@ -41,10 +41,11 @@ def main():
 
     dev0 = WpaSupplicant('wlan0')
     dev1 = WpaSupplicant('wlan1')
-    dev = [ dev0, dev1 ]
+    dev2 = WpaSupplicant('wlan2')
+    dev = [ dev0, dev1, dev2 ]
     apdev = [ ]
-    apdev.append({"ifname": 'wlan2', "bssid": "02:00:00:00:02:00"})
     apdev.append({"ifname": 'wlan3', "bssid": "02:00:00:00:03:00"})
+    apdev.append({"ifname": 'wlan4', "bssid": "02:00:00:00:04:00"})
 
     for d in dev:
         if not d.ping():

diff --git a/tests/hwsim/start-ap.sh b/tests/hwsim/start-ap.sh
index 5d327da8aa5c4c02e1e65f493c627060ce956d9d..2d8f5be70246e71b98b43095ee16a736f8f8c0f0 100755 (executable)
--- a/tests/hwsim/start-ap.sh
+++ b/tests/hwsim/start-ap.sh
@@ -6,12 +6,13 @@ HAPD=$DIR/../../hostapd/hostapd
 WLANTEST=$DIR/../../wlantest/wlantest
 
 $DIR/stop-wifi.sh
-sudo modprobe mac80211_hwsim radios=4
+sudo modprobe mac80211_hwsim radios=5
 mkdir -p $DIR/logs
 DATE=`date +%s`
 sudo ifconfig hwsim0 up
 sudo $WLANTEST -i hwsim0 -c -d > $DIR/logs/$DATE-hwsim0 &
 sudo $WPAS -Dnl80211 -iwlan0 -c $DIR/p2p0.conf -ddKt > $DIR/logs/$DATE-log0 &
 sudo $WPAS -Dnl80211 -iwlan1 -c $DIR/p2p1.conf -ddKt > $DIR/logs/$DATE-log1 &
+sudo $WPAS -Dnl80211 -iwlan2 -c $DIR/p2p2.conf -ddKt > $DIR/logs/$DATE-log2 &
 sudo $HAPD -ddKt -g $DIR/hostapd-global -G admin -ddKt > $DIR/logs/$DATE-hostapd &
 sleep 1