ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-22 06:57:57 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

mac80211: support wildcard paths when matching phys

Browse Source 
This change introduces support for wildcard patterns in "option path"
of section "wifi-device".

Objective is to allow paths like "*/usb[0-9]/*/*" in order to claim
any usb device using the same backend type, regardless of its bus
address or phy name.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 41873
This commit is contained in:
Jo-Philipp Wich 2014-07-29 09:48:07 +00:00
parent b6153f92ad
commit 1c0557cfa8
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
View File

@ -364,9 +364,13 @@ mac80211_generate_mac() {
find_phy() {
[ -n "$phy" -a -d /sys/class/ieee80211/$phy ] && return 0
[ -n "$path" -a -d "/sys/devices/$path/ieee80211" ] && {
phy="$(ls /sys/devices/$path/ieee80211 | grep -m 1 phy)"
[ -n "$phy" ] && return 0
[ -n "$path" ] && {
for phy in /sys/devices/$path/ieee80211/phy*; do
[ -e "$phy" ] && {
phy="${phy##*/}"
return 0
}
done
}
[ -n "$macaddr" ] && {
for phy in $(ls /sys/class/ieee80211 2>/dev/null); do

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

@ -8,9 +8,13 @@ lookup_phy() {
local devpath
config_get devpath "$device" path
[ -n "$devpath" -a -d "/sys/devices/$devpath/ieee80211" ] && {
phy="$(ls /sys/devices/$devpath/ieee80211 | grep -m 1 phy)"
[ -n "$phy" ] && return
[ -n "$devpath" ] && {
for _phy in /sys/devices/$devpath/ieee80211/phy*; do
[ -e "$_phy" ] && {
phy="${_phy##*/}"
return
}
done
}
local macaddr="$(config_get "$device" macaddr | tr 'A-Z' 'a-z')"