diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-11-11 21:57:26 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-11-11 21:57:26 +0000 |
commit | cac4ccca2f064a29c640db2eba90b7f8de271a41 (patch) | |
tree | 9c6a85bddbf5ae2f2a3ed8e395c2a718a06dab98 /package/kernel/broadcom-wl/files | |
parent | c36d24ec823fb600bc9eb7ccb53e495c0fea531f (diff) | |
download | upstream-cac4ccca2f064a29c640db2eba90b7f8de271a41.tar.gz upstream-cac4ccca2f064a29c640db2eba90b7f8de271a41.tar.bz2 upstream-cac4ccca2f064a29c640db2eba90b7f8de271a41.zip |
broadcom-wl: change interface names
'netifd' treats all devices with a "." in their name as vlan devices.
Modify the name of virtual/WDS interfaces created by broadcom-wl to use
a "-" instead of a ".", so they will be treated as simple devices
by 'netifd'.
Signed-off-by: Nathan Hintz <nlhintz@hotmail.com>
SVN-Revision: 38748
Diffstat (limited to 'package/kernel/broadcom-wl/files')
-rw-r--r-- | package/kernel/broadcom-wl/files/etc/hotplug.d/net/20-broadcom_wds | 2 | ||||
-rw-r--r-- | package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/broadcom-wl/files/etc/hotplug.d/net/20-broadcom_wds b/package/kernel/broadcom-wl/files/etc/hotplug.d/net/20-broadcom_wds index 0a563c2dbd..4e56d21acf 100644 --- a/package/kernel/broadcom-wl/files/etc/hotplug.d/net/20-broadcom_wds +++ b/package/kernel/broadcom-wl/files/etc/hotplug.d/net/20-broadcom_wds @@ -56,6 +56,6 @@ setup_broadcom_wds() { case "$ACTION" in add|register) - [ "${INTERFACE%%0.*}" = wds ] && setup_broadcom_wds "$INTERFACE" + [ "${INTERFACE%%0-*}" = wds ] && setup_broadcom_wds "$INTERFACE" ;; esac diff --git a/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh b/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh index 4d81bcb1b4..506b077ef2 100644 --- a/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh +++ b/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh @@ -45,7 +45,7 @@ scan_broadcom() { local _c= for vif in ${adhoc_if:-$sta_if $ap_if $mon_if}; do - config_set "$vif" ifname "${device}${_c:+.$_c}" + config_set "$vif" ifname "${device}${_c:+-$_c}" _c=$((${_c:-0} + 1)) done config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if $mon_if}" @@ -102,7 +102,7 @@ disable_broadcom() { include /lib/network # make sure the interfaces are down and removed from all bridges - for dev in $device ${device}.1 ${device}.2 ${device}.3; do + for dev in $device ${device}-1 ${device}-2 ${device}-3; do ifconfig "$dev" down 2>/dev/null >/dev/null && { unbridge "$dev" } |