|
@@ -100,7 +100,7 @@ function setup_wifi_atheros {
|
100
|
100
|
fi
|
101
|
101
|
dpkg -i "$atheros_drivers_file"
|
102
|
102
|
reset_usb_devices
|
103
|
|
- update_wifi_adaptors
|
|
103
|
+ update_wifi_adaptors 'wlan'
|
104
|
104
|
if [ "$IFACE" ]; then
|
105
|
105
|
wpa_action "${IFACE}" stop
|
106
|
106
|
wpa_cli -i "${IFACE}" terminate
|
|
@@ -198,19 +198,24 @@ function install_atheros_wifi {
|
198
|
198
|
}
|
199
|
199
|
|
200
|
200
|
function update_wifi_adaptors {
|
|
201
|
+ interface_type="$1"
|
201
|
202
|
IFACE=
|
202
|
203
|
IFACE_SECONDARY=
|
203
|
204
|
|
|
205
|
+ if [ ! "$interface_type" ]; then
|
|
206
|
+ interface_type='wlan'
|
|
207
|
+ fi
|
|
208
|
+
|
204
|
209
|
for i in $(seq 10 -1 0); do
|
205
|
|
- ifdown --force "wlan${i}" 2> /dev/null
|
|
210
|
+ ifdown --force "${interface_type}${i}" 2> /dev/null
|
206
|
211
|
done
|
207
|
212
|
|
208
|
213
|
for i in $(seq 10 -1 0); do
|
209
|
|
- if grep -q "wlan${i}" /proc/net/dev; then
|
|
214
|
+ if grep -q "${interface_type}${i}" /proc/net/dev; then
|
210
|
215
|
if [ ! $IFACE ]; then
|
211
|
216
|
IFACE="wlan${i}"
|
212
|
217
|
else
|
213
|
|
- IFACE_SECONDARY="wlan${i}"
|
|
218
|
+ IFACE_SECONDARY="${interface_type}${i}"
|
214
|
219
|
return
|
215
|
220
|
fi
|
216
|
221
|
fi
|
|
@@ -479,7 +484,7 @@ function wifi_networks_file_header {
|
479
|
484
|
|
480
|
485
|
function create_networks_interactive {
|
481
|
486
|
remove_config_param "WIFI_INTERFACE"
|
482
|
|
- update_wifi_adaptors
|
|
487
|
+ update_wifi_adaptors 'wlan'
|
483
|
488
|
if [ ! "$IFACE" ]; then
|
484
|
489
|
# Don't try to configure wifi if there are no adaptors
|
485
|
490
|
return
|