ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-03-29 07:06:20 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

mac80211: fix fallback to macaddr

Browse Source 
If '/sys/class/ieee80211/phyN' is not a symlink, the call to readlink
produces either an empty path (if /sys/class/ieee80211/phyN/device doesn't
exist) or a path that begins with '/sys/class/ieee80211' (which does not
work with the subsequent line to strip '/sys/devices' from the beginning of
the path).  Modify the checks to detect these conditions, and fallback to
using the macaddr.

Signed-off-by: Nathan Hintz <nlhintz@hotmail.com>

SVN-Revision: 44172
This commit is contained in:
John Crispin 2015-01-28 12:07:08 +00:00
parent f283700396
commit e0aaac8434
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/kernel/mac80211/files/lib/wifi/mac80211.sh
View File

@ -94,8 +94,12 @@ detect_mac80211() {
[ -n $htmode ] && append ht_capab " option htmode $htmode" "$N" [ -n $htmode ] && append ht_capab " option htmode $htmode" "$N"
if [ -x /usr/bin/readlink ]; then if [ -x /usr/bin/readlink -a -h /sys/class/ieee80211/${dev} ]; then
path="$(readlink -f /sys/class/ieee80211/${dev}/device)" path="$(readlink -f /sys/class/ieee80211/${dev}/device)"
else
path=""
fi
if [ -n "$path" ]; then
path="${path##/sys/devices/}" path="${path##/sys/devices/}"
dev_id=" option path '$path'" dev_id=" option path '$path'"
else else