mac80211: support wildcard paths when matching phys

[openwrt/openwrt.git] / package / kernel / mac80211 / files / lib / netifd / wireless / mac80211.sh

diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index b19b928cea10df17daa6a34362bcde1cd2b81e26..e6241deb5f8c115033cc9264fe9b2830e1e77c56 100644 (file)
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -37,6 +37,12 @@ drv_mac80211_init_device_config() {
                rx_antenna_pattern \
                tx_antenna_pattern
        config_add_int vht_max_a_mpdu_len_exp vht_max_mpdu vht_link_adapt vht160 rx_stbc tx_stbc
+       config_add_boolean \
+               ldpc \
+               greenfield \
+               short_gi_20 \
+               short_gi_40 \
+               dsss_cck_40
 }
 
 drv_mac80211_init_iface_config() {
@@ -47,7 +53,7 @@ drv_mac80211_init_iface_config() {
        config_add_boolean wds powersave
        config_add_int maxassoc
        config_add_int max_listen_int
-       config_add_int dtim_interval
+       config_add_int dtim_period
 
        # mesh
        config_add_string mesh_id
@@ -121,7 +127,7 @@ mac80211_hostapd_setup_base() {
 
                json_get_vars \
                        ldpc:1 \
-                       greenfield:1 \
+                       greenfield:0 \
                        short_gi_20:1 \
                        short_gi_40:1 \
                        tx_stbc:1 \
@@ -358,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