mac80211: netifd: Use a mask when using `iw set antenna`

[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 bf9d52ae4203c294e25487f1678cfcd25e7a1dce..e9389e34477b9cf4f90c4c61994c121abdaaebaf 100644 (file)
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -14,6 +14,10 @@ MP_CONFIG_INT="mesh_retry_timeout mesh_confirm_timeout mesh_holding_timeout mesh
 MP_CONFIG_BOOL="mesh_auto_open_plinks mesh_fwding"
 MP_CONFIG_STRING="mesh_power_mode"
 
+iw() {
+       command iw $@ || logger -t mac80211 "Failed command: iw $@"
+}
+
 drv_mac80211_init_device_config() {
        hostapd_common_add_device_config
 
@@ -518,13 +522,17 @@ mac80211_prepare_vif() {
 
 mac80211_setup_supplicant() {
        wpa_supplicant_prepare_interface "$ifname" nl80211 || return 1
-       wpa_supplicant_add_network "$ifname"
+       if [ "$mode" = "sta" ]; then
+               wpa_supplicant_add_network "$ifname"
+       else
+               wpa_supplicant_add_network "$ifname" "$freq" "$htmode" "$noscan"
+       fi
        wpa_supplicant_run "$ifname" ${hostapd_ctrl:+-H $hostapd_ctrl}
 }
 
 mac80211_setup_supplicant_noctl() {
        wpa_supplicant_prepare_interface "$ifname" nl80211 || return 1
-       wpa_supplicant_add_network "$ifname" "$freq" "$htmode"
+       wpa_supplicant_add_network "$ifname" "$freq" "$htmode" "$noscan"
        wpa_supplicant_run "$ifname"
 }
 
@@ -606,6 +614,51 @@ mac80211_setup_adhoc() {
                ${keyspec:+keys $keyspec}
 }
 
+mac80211_setup_mesh() {
+       json_get_vars ssid mesh_id mcast_rate
+
+       mcval=
+       [ -n "$mcast_rate" ] && wpa_supplicant_add_rate mcval "$mcast_rate"
+       [ -n "$mesh_id" ] && ssid="$mesh_id"
+
+       case "$htmode" in
+               VHT20|HT20) mesh_htmode=HT20;;
+               HT40*|VHT40)
+                       case "$hwmode" in
+                               a)
+                                       case "$(( ($channel / 4) % 2 ))" in
+                                               1) mesh_htmode="HT40+" ;;
+                                               0) mesh_htmode="HT40-";;
+                                       esac
+                               ;;
+                               *)
+                                       case "$htmode" in
+                                               HT40+) mesh_htmode="HT40+";;
+                                               HT40-) mesh_htmode="HT40-";;
+                                               *)
+                                                       if [ "$channel" -lt 7 ]; then
+                                                               mesh_htmode="HT40+"
+                                                       else
+                                                               mesh_htmode="HT40-"
+                                                       fi
+                                               ;;
+                                       esac
+                               ;;
+                       esac
+               ;;
+               VHT80)
+                       mesh_htmode="80Mhz"
+               ;;
+               VHT160)
+                       mesh_htmode="160Mhz"
+               ;;
+               *) mesh_htmode="NOHT" ;;
+       esac
+       iw dev "$ifname" mesh join "$ssid" freq $freq $mesh_htmode \
+               ${mcval:+mcast-rate $mcval} \
+               beacon-interval $beacon_int
+}
+
 mac80211_setup_vif() {
        local name="$1"
        local failed
@@ -629,57 +682,13 @@ mac80211_setup_vif() {
 
        case "$mode" in
                mesh)
-                       json_get_vars key
-                       if [ -n "$key" ]; then
-                               wireless_vif_parse_encryption
-                               freq="$(get_freq "$phy" "$channel")"
-                               mac80211_setup_supplicant_noctl || failed=1
+                       wireless_vif_parse_encryption
+                       freq="$(get_freq "$phy" "$channel")"
+                       if [ "$wpa" -gt 0 -o "$auto_channel" -gt 0 ] || chan_is_dfs "$phy" "$channel"; then
+                               mac80211_setup_supplicant || failed=1
                        else
-                               json_get_vars mesh_id mcast_rate
-
-                               mcval=
-                               [ -n "$mcast_rate" ] && wpa_supplicant_add_rate mcval "$mcast_rate"
-
-                               case "$htmode" in
-                                       VHT20|HT20) mesh_htmode=HT20;;
-                                       HT40*|VHT40)
-                                               case "$hwmode" in
-                                                       a)
-                                                               case "$(( ($channel / 4) % 2 ))" in
-                                                                       1) mesh_htmode="HT40+" ;;
-                                                                       0) mesh_htmode="HT40-";;
-                                                               esac
-                                                       ;;
-                                                       *)
-                                                               case "$htmode" in
-                                                                       HT40+) mesh_htmode="HT40+";;
-                                                                       HT40-) mesh_htmode="HT40-";;
-                                                                       *)
-                                                                               if [ "$channel" -lt 7 ]; then
-                                                                                       mesh_htmode="HT40+"
-                                                                               else
-                                                                                       mesh_htmode="HT40-"
-                                                                               fi
-                                                                       ;;
-                                                               esac
-                                                       ;;
-                                               esac
-                                       ;;
-                                       VHT80)
-                                               mesh_htmode="80Mhz"
-                                       ;;
-                                       VHT160)
-                                               mesh_htmode="160Mhz"
-                                       ;;
-                                       *) mesh_htmode="NOHT" ;;
-                               esac
-
-                               freq="$(get_freq "$phy" "$channel")"
-                               iw dev "$ifname" mesh join "$mesh_id" freq $freq $mesh_htmode \
-                                       ${mcval:+mcast-rate $mcval} \
-                                       beacon-interval $beacon_int
+                               mac80211_setup_mesh
                        fi
-
                        for var in $MP_CONFIG_INT $MP_CONFIG_BOOL $MP_CONFIG_STRING; do
                                json_get_var mp_val "$var"
                                [ -n "$mp_val" ] && iw dev "$ifname" set mesh_param "$var" "$mp_val"
@@ -710,6 +719,13 @@ get_freq() {
        iw "$phy" info | grep -E -m1 "(\* ${chan:-....} MHz${chan:+|\\[$chan\\]})" | grep MHz | awk '{print $2}'
 }
 
+chan_is_dfs() {
+       local phy="$1"
+       local chan="$2"
+       iw "$phy" info | grep -E -m1 "(\* ${chan:-....} MHz${chan:+|\\[$chan\\]})" | grep -q "MHz.*radar detection"
+       return $!
+}
+
 mac80211_interface_cleanup() {
        local phy="$1"
 
@@ -765,11 +781,14 @@ drv_mac80211_setup() {
                done
        }
 
-       set_default rxantenna all
-       set_default txantenna all
+       set_default rxantenna 0xffffffff
+       set_default txantenna 0xffffffff
        set_default distance 0
        set_default antenna_gain 0
 
+       [ "$txantenna" = "all" ] && txantenna=0xffffffff
+       [ "$rxantenna" = "all" ] && rxantenna=0xffffffff
+
        iw phy "$phy" set antenna $txantenna $rxantenna >/dev/null 2>&1
        iw phy "$phy" set antenna_gain $antenna_gain
        iw phy "$phy" set distance "$distance"