mac80211: only add the mbssid option to the config when set
[openwrt/openwrt.git] / package / kernel / mac80211 / files / lib / netifd / wireless / mac80211.sh
index 17095b72059647bfed4c376536509c5c7d87ca54..860609305f4539e33eec7a9d3460e7552ef02566 100644 (file)
@@ -1,7 +1,7 @@
 #!/bin/sh
 . /lib/netifd/netifd-wireless.sh
 . /lib/netifd/hostapd.sh
-. /lib/netifd/mac80211.sh
+. /lib/functions/system.sh
 
 init_wireless_driver "$@"
 
@@ -15,25 +15,23 @@ 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"
 
-NEWAPLIST=
-OLDAPLIST=
-NEWSPLIST=
-OLDSPLIST=
-NEWUMLIST=
-OLDUMLIST=
+wdev_tool() {
+       ucode /usr/share/hostap/wdev.uc "$@"
+}
 
 drv_mac80211_init_device_config() {
        hostapd_common_add_device_config
 
        config_add_string path phy 'macaddr:macaddr'
-       config_add_string hwmode
        config_add_string tx_burst
        config_add_string distance
        config_add_int beacon_int chanbw frag rts
-       config_add_int rxantenna txantenna antenna_gain txpower
-       config_add_boolean noscan ht_coex acs_exclude_dfs
+       config_add_int rxantenna txantenna txpower min_tx_power
+       config_add_int num_global_macaddr multiple_bssid
+       config_add_boolean noscan ht_coex acs_exclude_dfs background_radar
        config_add_array ht_capab
        config_add_array channels
+       config_add_array scan_list
        config_add_boolean \
                rxldpc \
                short_gi_80 \
@@ -43,11 +41,28 @@ drv_mac80211_init_device_config() {
                su_beamformee \
                mu_beamformer \
                mu_beamformee \
+               he_su_beamformer \
+               he_su_beamformee \
+               he_mu_beamformer \
                vht_txop_ps \
                htc_vht \
                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
+               tx_antenna_pattern \
+               he_spr_sr_control \
+               he_spr_psr_enabled \
+               he_bss_color_enabled \
+               he_twt_required
+       config_add_int \
+               beamformer_antennas \
+               beamformee_antennas \
+               vht_max_a_mpdu_len_exp \
+               vht_max_mpdu \
+               vht_link_adapt \
+               vht160 \
+               rx_stbc \
+               tx_stbc \
+               he_bss_color \
+               he_spr_non_srg_obss_pd_max_offset
        config_add_boolean \
                ldpc \
                greenfield \
@@ -95,6 +110,23 @@ mac80211_add_capabilities() {
        export -n -- "$__var=$__out"
 }
 
+mac80211_add_he_capabilities() {
+       local __out= oifs
+
+       oifs="$IFS"
+       IFS=:
+       for capab in "$@"; do
+               set -- $capab
+               [ "$(($4))" -gt 0 ] || continue
+               [ "$(((0x$2) & $3))" -gt 0 ] || {
+                       eval "$1=0"
+                       continue
+               }
+               append base_cfg "$1=1" "$N"
+       done
+       IFS="$oifs"
+}
+
 mac80211_hostapd_setup_base() {
        local phy="$1"
 
@@ -106,18 +138,23 @@ mac80211_hostapd_setup_base() {
        [ -n "$acs_exclude_dfs" ] && [ "$acs_exclude_dfs" -gt 0 ] &&
                append base_cfg "acs_exclude_dfs=1" "$N"
 
-       json_get_vars noscan ht_coex
-       json_get_values ht_capab_list ht_capab tx_burst
+       json_get_vars noscan ht_coex min_tx_power:0 tx_burst
+       json_get_values ht_capab_list ht_capab
        json_get_values channel_list channels
 
        [ "$auto_channel" = 0 ] && [ -z "$channel_list" ] && \
                channel_list="$channel"
 
+       [ "$min_tx_power" -gt 0 ] && append base_cfg "min_tx_power=$min_tx_power"
+
        set_default noscan 0
 
        [ "$noscan" -gt 0 ] && hostapd_noscan=1
        [ "$tx_burst" = 0 ] && tx_burst=
 
+       chan_ofs=0
+       [ "$band" = "6g" ] && chan_ofs=1
+
        ieee80211n=1
        ht_capab=
        case "$htmode" in
@@ -125,7 +162,7 @@ mac80211_hostapd_setup_base() {
                HT40*|VHT40|VHT80|VHT160|HE40|HE80|HE160)
                        case "$hwmode" in
                                a)
-                                       case "$(( ($channel / 4) % 2 ))" in
+                                       case "$(( (($channel / 4) + $chan_ofs) % 2 ))" in
                                                1) ht_capab="[HT40+]";;
                                                0) ht_capab="[HT40-]";;
                                        esac
@@ -199,7 +236,7 @@ mac80211_hostapd_setup_base() {
        case "$htmode" in
                VHT20|HE20) enable_ac=1;;
                VHT40|HE40)
-                       case "$(( ($channel / 4) % 2 ))" in
+                       case "$(( (($channel / 4) + $chan_ofs) % 2 ))" in
                                1) idx=$(($channel + 2));;
                                0) idx=$(($channel - 2));;
                        esac
@@ -207,7 +244,7 @@ mac80211_hostapd_setup_base() {
                        vht_center_seg0=$idx
                ;;
                VHT80|HE80)
-                       case "$(( ($channel / 4) % 4 ))" in
+                       case "$(( (($channel / 4) + $chan_ofs) % 4 ))" in
                                1) idx=$(($channel + 6));;
                                2) idx=$(($channel + 2));;
                                3) idx=$(($channel - 2));;
@@ -218,15 +255,40 @@ mac80211_hostapd_setup_base() {
                        vht_center_seg0=$idx
                ;;
                VHT160|HE160)
-                       case "$channel" in
-                               36|40|44|48|52|56|60|64) idx=50;;
-                               100|104|108|112|116|120|124|128) idx=114;;
-                       esac
+                       if [ "$band" = "6g" ]; then
+                               case "$channel" in
+                                       1|5|9|13|17|21|25|29) idx=15;;
+                                       33|37|41|45|49|53|57|61) idx=47;;
+                                       65|69|73|77|81|85|89|93) idx=79;;
+                                       97|101|105|109|113|117|121|125) idx=111;;
+                                       129|133|137|141|145|149|153|157) idx=143;;
+                                       161|165|169|173|177|181|185|189) idx=175;;
+                                       193|197|201|205|209|213|217|221) idx=207;;
+                               esac
+                       else
+                               case "$channel" in
+                                       36|40|44|48|52|56|60|64) idx=50;;
+                                       100|104|108|112|116|120|124|128) idx=114;;
+                               esac
+                       fi
                        enable_ac=1
                        vht_oper_chwidth=2
                        vht_center_seg0=$idx
                ;;
        esac
+       [ "$band" = "5g" ] && {
+               json_get_vars background_radar:0
+
+               [ "$background_radar" -eq 1 ] && append base_cfg "enable_background_radar=1" "$N"
+       }
+       [ "$band" = "6g" ] && {
+               op_class=
+               case "$htmode" in
+                       HE20) op_class=131;;
+                       HE*) op_class=$((132 + $vht_oper_chwidth))
+               esac
+               [ -n "$op_class" ] && append base_cfg "op_class=$op_class" "$N"
+       }
        [ "$hwmode" = "a" ] || enable_ac=0
 
        if [ "$enable_ac" != "0" ]; then
@@ -241,6 +303,8 @@ mac80211_hostapd_setup_base() {
                        mu_beamformee:1 \
                        vht_txop_ps:1 \
                        htc_vht:1 \
+                       beamformee_antennas:4 \
+                       beamformer_antennas:4 \
                        rx_antenna_pattern:1 \
                        tx_antenna_pattern:1 \
                        vht_max_a_mpdu_len_exp:7 \
@@ -281,6 +345,18 @@ mac80211_hostapd_setup_base() {
                        RX-STBC-123:0x700:0x300:1 \
                        RX-STBC-1234:0x700:0x400:1 \
 
+               [ "$(($vht_cap & 0x800))" -gt 0 -a "$su_beamformer" -gt 0 ] && {
+                       cap_ant="$(( ( ($vht_cap >> 16) & 3 ) + 1 ))"
+                       [ "$cap_ant" -gt "$beamformer_antennas" ] && cap_ant="$beamformer_antennas"
+                       [ "$cap_ant" -gt 1 ] && vht_capab="$vht_capab[SOUNDING-DIMENSION-$cap_ant]"
+               }
+
+               [ "$(($vht_cap & 0x1000))" -gt 0 -a "$su_beamformee" -gt 0 ] && {
+                       cap_ant="$(( ( ($vht_cap >> 13) & 3 ) + 1 ))"
+                       [ "$cap_ant" -gt "$beamformee_antennas" ] && cap_ant="$beamformee_antennas"
+                       [ "$cap_ant" -gt 1 ] && vht_capab="$vht_capab[BF-ANTENNA-$cap_ant]"
+               }
+
                # supported Channel widths
                vht160_hw=0
                [ "$(($vht_cap & 12))" -eq 4 -a 1 -le "$vht160" ] && \
@@ -336,16 +412,74 @@ mac80211_hostapd_setup_base() {
        esac
 
        if [ "$enable_ax" != "0" ]; then
+               json_get_vars \
+                       he_su_beamformer:1 \
+                       he_su_beamformee:1 \
+                       he_mu_beamformer:1 \
+                       he_twt_required:0 \
+                       he_spr_sr_control:3 \
+                       he_spr_psr_enabled:0 \
+                       he_spr_non_srg_obss_pd_max_offset:0 \
+                       he_bss_color:128 \
+                       he_bss_color_enabled:1
+
+               he_phy_cap=$(iw phy "$phy" info | sed -n '/HE Iftypes: AP/,$p' | awk -F "[()]" '/HE PHY Capabilities/ { print $2 }' | head -1)
+               he_phy_cap=${he_phy_cap:2}
+               he_mac_cap=$(iw phy "$phy" info | sed -n '/HE Iftypes: AP/,$p' | awk -F "[()]" '/HE MAC Capabilities/ { print $2 }' | head -1)
+               he_mac_cap=${he_mac_cap:2}
+
                append base_cfg "ieee80211ax=1" "$N"
                [ "$hwmode" = "a" ] && {
                        append base_cfg "he_oper_chwidth=$vht_oper_chwidth" "$N"
                        append base_cfg "he_oper_centr_freq_seg0_idx=$vht_center_seg0" "$N"
                }
+
+               mac80211_add_he_capabilities \
+                       he_su_beamformer:${he_phy_cap:6:2}:0x80:$he_su_beamformer \
+                       he_su_beamformee:${he_phy_cap:8:2}:0x1:$he_su_beamformee \
+                       he_mu_beamformer:${he_phy_cap:8:2}:0x2:$he_mu_beamformer \
+                       he_spr_psr_enabled:${he_phy_cap:14:2}:0x1:$he_spr_psr_enabled \
+                       he_twt_required:${he_mac_cap:0:2}:0x6:$he_twt_required
+
+               if [ "$he_bss_color_enabled" -gt 0 ]; then
+                       append base_cfg "he_bss_color=$he_bss_color" "$N"
+                       [ "$he_spr_non_srg_obss_pd_max_offset" -gt 0 ] && { \
+                               append base_cfg "he_spr_non_srg_obss_pd_max_offset=$he_spr_non_srg_obss_pd_max_offset" "$N"
+                               he_spr_sr_control=$((he_spr_sr_control | (1 << 2)))
+                       }
+                       [ "$he_spr_psr_enabled" -gt 0 ] || he_spr_sr_control=$((he_spr_sr_control | (1 << 0)))
+                       append base_cfg "he_spr_sr_control=$he_spr_sr_control" "$N"
+               else
+                       append base_cfg "he_bss_color_disabled=1" "$N"
+               fi
+
+
                append base_cfg "he_default_pe_duration=4" "$N"
                append base_cfg "he_rts_threshold=1023" "$N"
-               append base_cfg "he_su_beamformer=1" "$N"
-               append base_cfg "he_su_beamformee=1" "$N"
-               append base_cfg "he_mu_beamformer=1023" "$N"
+               append base_cfg "he_mu_edca_qos_info_param_count=0" "$N"
+               append base_cfg "he_mu_edca_qos_info_q_ack=0" "$N"
+               append base_cfg "he_mu_edca_qos_info_queue_request=0" "$N"
+               append base_cfg "he_mu_edca_qos_info_txop_request=0" "$N"
+               append base_cfg "he_mu_edca_ac_be_aifsn=8" "$N"
+               append base_cfg "he_mu_edca_ac_be_aci=0" "$N"
+               append base_cfg "he_mu_edca_ac_be_ecwmin=9" "$N"
+               append base_cfg "he_mu_edca_ac_be_ecwmax=10" "$N"
+               append base_cfg "he_mu_edca_ac_be_timer=255" "$N"
+               append base_cfg "he_mu_edca_ac_bk_aifsn=15" "$N"
+               append base_cfg "he_mu_edca_ac_bk_aci=1" "$N"
+               append base_cfg "he_mu_edca_ac_bk_ecwmin=9" "$N"
+               append base_cfg "he_mu_edca_ac_bk_ecwmax=10" "$N"
+               append base_cfg "he_mu_edca_ac_bk_timer=255" "$N"
+               append base_cfg "he_mu_edca_ac_vi_ecwmin=5" "$N"
+               append base_cfg "he_mu_edca_ac_vi_ecwmax=7" "$N"
+               append base_cfg "he_mu_edca_ac_vi_aifsn=5" "$N"
+               append base_cfg "he_mu_edca_ac_vi_aci=2" "$N"
+               append base_cfg "he_mu_edca_ac_vi_timer=255" "$N"
+               append base_cfg "he_mu_edca_ac_vo_aifsn=5" "$N"
+               append base_cfg "he_mu_edca_ac_vo_aci=3" "$N"
+               append base_cfg "he_mu_edca_ac_vo_ecwmin=5" "$N"
+               append base_cfg "he_mu_edca_ac_vo_ecwmax=7" "$N"
+               append base_cfg "he_mu_edca_ac_vo_timer=255" "$N"
        fi
 
        hostapd_prepare_device_config "$hostapd_conf_file" nl80211
@@ -354,12 +488,12 @@ ${channel:+channel=$channel}
 ${channel_list:+chanlist=$channel_list}
 ${hostapd_noscan:+noscan=1}
 ${tx_burst:+tx_queue_data2_burst=$tx_burst}
+${multiple_bssid:+mbssid=$multiple_bssid}
+#num_global_macaddr=$num_global_macaddr
 $base_cfg
 
 EOF
        json_select ..
-       radio_md5sum=$(md5sum $hostapd_conf_file | cut -d" " -f1)
-       echo "radio_config_id=${radio_md5sum}" >> $hostapd_conf_file
 }
 
 mac80211_hostapd_setup_bss() {
@@ -371,7 +505,7 @@ mac80211_hostapd_setup_bss() {
        hostapd_cfg=
        append hostapd_cfg "$type=$ifname" "$N"
 
-       hostapd_set_bss_options hostapd_cfg "$vif" || return 1
+       hostapd_set_bss_options hostapd_cfg "$phy" "$vif" || return 1
        json_get_vars wds wds_bridge dtim_period max_listen_int start_disabled
 
        set_default wds 0
@@ -386,6 +520,7 @@ mac80211_hostapd_setup_bss() {
        cat >> /var/run/hostapd-$phy.conf <<EOF
 $hostapd_cfg
 bssid=$macaddr
+${default_macaddr:+#default_macaddr}
 ${dtim_period:+dtim_period=$dtim_period}
 ${max_listen_int:+max_listen_interval=$max_listen_int}
 EOF
@@ -402,58 +537,80 @@ mac80211_generate_mac() {
        local phy="$1"
        local id="${macidx:-0}"
 
-       local ref="$(cat /sys/class/ieee80211/${phy}/macaddress)"
-       local mask="$(cat /sys/class/ieee80211/${phy}/address_mask)"
+       wdev_tool "$phy" get_macaddr id=$id num_global=$num_global_macaddr mbssid=${multiple_bssid:-0}
+}
 
-       [ "$mask" = "00:00:00:00:00:00" ] && {
-               mask="ff:ff:ff:ff:ff:ff";
+get_board_phy_name() (
+       local path="$1"
+       local fallback_phy=""
 
-               [ "$(wc -l < /sys/class/ieee80211/${phy}/addresses)" -gt 1 ] && {
-                       addr="$(mac80211_get_addr "$phy" "$id")"
-                       [ -n "$addr" ] && {
-                               echo "$addr"
-                               return
-                       }
-               }
-       }
-
-       local oIFS="$IFS"; IFS=":"; set -- $mask; IFS="$oIFS"
+       __check_phy() {
+               local val="$1"
+               local key="$2"
+               local ref_path="$3"
 
-       local mask1=$1
-       local mask6=$6
+               json_select "$key"
+               json_get_values path
+               json_select ..
 
-       local oIFS="$IFS"; IFS=":"; set -- $ref; IFS="$oIFS"
+               [ "${ref_path%+*}" = "$path" ] && fallback_phy=$key
+               [ "$ref_path" = "$path" ] || return 0
 
-       macidx=$(($id + 1))
-       [ "$((0x$mask1))" -gt 0 ] && {
-               b1="0x$1"
-               [ "$id" -gt 0 ] && \
-                       b1=$(($b1 ^ ((($id - !($b1 & 2)) << 2) | 0x2)))
-               printf "%02x:%s:%s:%s:%s:%s" $b1 $2 $3 $4 $5 $6
-               return
+               echo "$key"
+               exit
        }
 
-       [ "$((0x$mask6))" -lt 255 ] && {
-               printf "%s:%s:%s:%s:%s:%02x" $1 $2 $3 $4 $5 $(( 0x$6 ^ $id ))
-               return
-       }
+       json_load_file /etc/board.json
+       json_for_each_item __check_phy wlan "$path"
+       [ -n "$fallback_phy" ] && echo "${fallback_phy}.${path##*+}"
+)
 
-       off2=$(( (0x$6 + $id) / 0x100 ))
-       printf "%s:%s:%s:%s:%02x:%02x" \
-               $1 $2 $3 $4 \
-               $(( (0x$5 + $off2) % 0x100 )) \
-               $(( (0x$6 + $id) % 0x100 ))
+rename_board_phy_by_path() {
+       local path="$1"
+
+       local new_phy="$(get_board_phy_name "$path")"
+       [ -z "$new_phy" -o "$new_phy" = "$phy" ] && return
+
+       iw "$phy" set name "$new_phy" && phy="$new_phy"
 }
 
+rename_board_phy_by_name() (
+       local phy="$1"
+       local suffix="${phy##*.}"
+       [ "$suffix" = "$phy" ] && suffix=
+
+       json_load_file /etc/board.json
+       json_select wlan
+       json_select "${phy%.*}" || return 0
+       json_get_values path
+
+       prev_phy="$(iwinfo nl80211 phyname "path=$path${suffix:++$suffix}")"
+       [ -n "$prev_phy" ] || return 0
+
+       [ "$prev_phy" = "$phy" ] && return 0
+
+       iw "$prev_phy" set name "$phy"
+)
+
 find_phy() {
-       [ -n "$phy" -a -d /sys/class/ieee80211/$phy ] && return 0
+       [ -n "$phy" ] && {
+               rename_board_phy_by_name "$phy"
+               [ -d /sys/class/ieee80211/$phy ] && return 0
+       }
        [ -n "$path" ] && {
-               phy="$(mac80211_path_to_phy "$path")"
-               [ -n "$phy" ] && return 0
+               phy="$(iwinfo nl80211 phyname "path=$path")"
+               [ -n "$phy" ] && {
+                       rename_board_phy_by_path "$path"
+                       return 0
+               }
        }
        [ -n "$macaddr" ] && {
                for phy in $(ls /sys/class/ieee80211 2>/dev/null); do
-                       grep -i -q "$macaddr" "/sys/class/ieee80211/${phy}/macaddress" && return 0
+                       grep -i -q "$macaddr" "/sys/class/ieee80211/${phy}/macaddress" && {
+                               path="$(iwinfo nl80211 path "$phy")"
+                               rename_board_phy_by_path "$path"
+                               return 0
+                       }
                done
        }
        return 1
@@ -463,72 +620,10 @@ mac80211_check_ap() {
        has_ap=1
 }
 
-mac80211_iw_interface_add() {
+mac80211_set_ifname() {
        local phy="$1"
-       local ifname="$2"
-       local type="$3"
-       local wdsflag="$4"
-       local rc
-       local oldifname
-
-       iw phy "$phy" interface add "$ifname" type "$type" $wdsflag >/dev/null 2>&1
-       rc="$?"
-
-       [ "$rc" = 233 ] && {
-               # Device might have just been deleted, give the kernel some time to finish cleaning it up
-               sleep 1
-
-               iw phy "$phy" interface add "$ifname" type "$type" $wdsflag >/dev/null 2>&1
-               rc="$?"
-       }
-
-       [ "$rc" = 233 ] && {
-               # Keep matching pre-existing interface
-               [ -d "/sys/class/ieee80211/${phy}/device/net/${ifname}" ] && \
-               case "$(iw dev $ifname info | grep "^\ttype" | cut -d' ' -f2- 2>/dev/null)" in
-                       "AP")
-                               [ "$type" = "__ap" ] && rc=0
-                               ;;
-                       "IBSS")
-                               [ "$type" = "adhoc" ] && rc=0
-                               ;;
-                       "managed")
-                               [ "$type" = "managed" ] && rc=0
-                               ;;
-                       "mesh point")
-                               [ "$type" = "mp" ] && rc=0
-                               ;;
-                       "monitor")
-                               [ "$type" = "monitor" ] && rc=0
-                               ;;
-               esac
-       }
-
-       [ "$rc" = 233 ] && {
-               iw dev "$ifname" del >/dev/null 2>&1
-               [ "$?" = 0 ] && {
-                       sleep 1
-
-                       iw phy "$phy" interface add "$ifname" type "$type" $wdsflag >/dev/null 2>&1
-                       rc="$?"
-               }
-       }
-
-       [ "$rc" != 0 ] && {
-               # Device might not support virtual interfaces, so the interface never got deleted in the first place.
-               # Check if the interface already exists, and avoid failing in this case.
-               [ -d "/sys/class/ieee80211/${phy}/device/net/${ifname}" ] && rc=0
-       }
-
-       [ "$rc" != 0 ] && {
-               # Device doesn't support virtual interfaces and may have existing interface other than ifname.
-               oldifname="$(basename "/sys/class/ieee80211/${phy}/device/net"/* 2>/dev/null)"
-               [ "$oldifname" ] && ip link set "$oldifname" name "$ifname" 1>/dev/null 2>&1
-               rc="$?"
-       }
-
-       [ "$rc" != 0 ] && wireless_setup_failed INTERFACE_CREATION_FAILED
-       return $rc
+       local prefix="$2"
+       eval "ifname=\"$phy-$prefix\${idx_$prefix:-0}\"; idx_$prefix=\$((\${idx_$prefix:-0 } + 1))"
 }
 
 mac80211_prepare_vif() {
@@ -536,22 +631,35 @@ mac80211_prepare_vif() {
 
        json_get_vars ifname mode ssid wds powersave macaddr enable wpa_psk_file vlan_file
 
-       [ -n "$ifname" ] || ifname="wlan${phy#phy}${if_idx:+-$if_idx}"
-       if_idx=$((${if_idx:-0} + 1))
+       [ -n "$ifname" ] || {
+               local prefix;
+
+               case "$mode" in
+               ap|sta|mesh) prefix=$mode;;
+               adhoc) prefix=ibss;;
+               monitor) prefix=mon;;
+               esac
+
+               mac80211_set_ifname "$phy" "$prefix"
+       }
 
+       append active_ifnames "$ifname"
        set_default wds 0
        set_default powersave 0
+       json_add_string _ifname "$ifname"
 
-       json_select ..
-
-       [ -n "$macaddr" ] || {
+       default_macaddr=
+       if [ -z "$macaddr" ]; then
                macaddr="$(mac80211_generate_mac $phy)"
                macidx="$(($macidx + 1))"
-       }
+               default_macaddr=1
+       elif [ "$macaddr" = 'random' ]; then
+               macaddr="$(macaddr_random)"
+       fi
+       json_add_string _macaddr "$macaddr"
+       json_add_string _default_macaddr "$default_macaddr"
+       json_select ..
 
-       json_add_object data
-       json_add_string ifname "$ifname"
-       json_close_object
 
        [ "$mode" == "ap" ] && {
                [ -z "$wpa_psk_file" ] && hostapd_set_psk "$ifname"
@@ -562,9 +670,6 @@ mac80211_prepare_vif() {
 
        # It is far easier to delete and create the desired interface
        case "$mode" in
-               adhoc)
-                       mac80211_iw_interface_add "$phy" "$ifname" adhoc || return
-               ;;
                ap)
                        # Hostapd will handle recreating the interface and
                        # subsequent virtual APs belonging to the same PHY
@@ -576,126 +681,22 @@ mac80211_prepare_vif() {
 
                        mac80211_hostapd_setup_bss "$phy" "$ifname" "$macaddr" "$type" || return
 
-                       NEWAPLIST="${NEWAPLIST}$ifname "
                        [ -n "$hostapd_ctrl" ] || {
                                ap_ifname="${ifname}"
                                hostapd_ctrl="${hostapd_ctrl:-/var/run/hostapd/$ifname}"
                        }
                ;;
-               mesh)
-                       mac80211_iw_interface_add "$phy" "$ifname" mp || return
-               ;;
-               monitor)
-                       mac80211_iw_interface_add "$phy" "$ifname" monitor || return
-               ;;
-               sta)
-                       local wdsflag=
-                       [ "$enable" = 0 ] || staidx="$(($staidx + 1))"
-                       [ "$wds" -gt 0 ] && wdsflag="4addr on"
-                       mac80211_iw_interface_add "$phy" "$ifname" managed "$wdsflag" || return
-                       if [ "$wds" -gt 0 ]; then
-                               iw "$ifname" set 4addr on
-                       else
-                               iw "$ifname" set 4addr off
-                       fi
-                       [ "$powersave" -gt 0 ] && powersave="on" || powersave="off"
-                       iw "$ifname" set power_save "$powersave"
-               ;;
        esac
 
-       case "$mode" in
-               monitor|mesh)
-                       [ "$auto_channel" -gt 0 ] || iw dev "$ifname" set channel "$channel" $iw_htmode
-               ;;
-       esac
-
-       if [ "$mode" != "ap" ]; then
-               # ALL ap functionality will be passed to hostapd
-               # All interfaces must have unique mac addresses
-               # which can either be explicitly set in the device
-               # section, or automatically generated
-               ip link set dev "$ifname" address "$macaddr"
-       fi
-
        json_select ..
 }
 
-mac80211_setup_supplicant() {
-       local enable=$1
-       local add_sp=0
-       local spobj="$(ubus -S list | grep wpa_supplicant.${ifname})"
-
-       [ "$enable" = 0 ] && {
-               ubus call wpa_supplicant.${phy} config_del "{\"iface\":\"$ifname\"}"
-               ip link set dev "$ifname" down
-               iw dev "$ifname" del
-               return 0
-       }
-
-       wpa_supplicant_prepare_interface "$ifname" nl80211 || {
-               iw dev "$ifname" del
-               return 1
-       }
-       if [ "$mode" = "sta" ]; then
-               wpa_supplicant_add_network "$ifname"
-       else
-               wpa_supplicant_add_network "$ifname" "$freq" "$htmode" "$noscan"
-       fi
-
-       NEWSPLIST="${NEWSPLIST}$ifname "
-
-       if [ "${NEWAPLIST%% *}" != "${OLDAPLIST%% *}" ]; then
-               [ "$spobj" ] && ubus call wpa_supplicant config_remove "{\"iface\":\"$ifname\"}"
-               add_sp=1
-       fi
-       [ -z "$spobj" ] && add_sp=1
-
-       NEW_MD5_SP=$(test -e "${_config}" && md5sum ${_config})
-       OLD_MD5_SP=$(uci -q -P /var/state get wireless._${phy}.md5_${ifname})
-       if [ "$add_sp" = "1" ]; then
-               wpa_supplicant_run "$ifname" "$hostapd_ctrl"
-       else
-               [ "${NEW_MD5_SP}" == "${OLD_MD5_SP}" ] || ubus call $spobj reload
-       fi
-       uci -q -P /var/state set wireless._${phy}.md5_${ifname}="${NEW_MD5_SP}"
-       return 0
-}
-
-mac80211_setup_supplicant_noctl() {
-       local enable=$1
-       local spobj="$(ubus -S list | grep wpa_supplicant.${ifname})"
-       wpa_supplicant_prepare_interface "$ifname" nl80211 || {
-               iw dev "$ifname" del
-               return 1
-       }
-
-       wpa_supplicant_add_network "$ifname" "$freq" "$htmode" "$noscan"
-
-       NEWSPLIST="${NEWSPLIST}$ifname "
-       [ "$enable" = 0 ] && {
-               ubus call wpa_supplicant config_remove "{\"iface\":\"$ifname\"}"
-               ip link set dev "$ifname" down
-               return 0
-       }
-       if [ -z "$spobj" ]; then
-               wpa_supplicant_run "$ifname"
-       else
-               ubus call $spobj reload
-       fi
-}
-
 mac80211_prepare_iw_htmode() {
        case "$htmode" in
-               VHT20|HT20) iw_htmode=HT20;;
-               HT40*|VHT40|VHT160)
-                       case "$hwmode" in
-                               a)
-                                       case "$(( ($channel / 4) % 2 ))" in
-                                               1) iw_htmode="HT40+" ;;
-                                               0) iw_htmode="HT40-";;
-                                       esac
-                               ;;
-                               *)
+               VHT20|HT20|HE20) iw_htmode=HT20;;
+               HT40*|VHT40|VHT160|HE40)
+                       case "$band" in
+                               2g)
                                        case "$htmode" in
                                                HT40+) iw_htmode="HT40+";;
                                                HT40-) iw_htmode="HT40-";;
@@ -708,10 +709,16 @@ mac80211_prepare_iw_htmode() {
                                                ;;
                                        esac
                                ;;
+                               *)
+                                       case "$(( ($channel / 4) % 2 ))" in
+                                               1) iw_htmode="HT40+" ;;
+                                               0) iw_htmode="HT40-";;
+                                       esac
+                               ;;
                        esac
                        [ "$auto_channel" -gt 0 ] && iw_htmode="HT40+"
                ;;
-               VHT80)
+               VHT80|HE80)
                        iw_htmode="80MHZ"
                ;;
                NONE|NOHT)
@@ -721,6 +728,13 @@ mac80211_prepare_iw_htmode() {
        esac
 }
 
+mac80211_add_mesh_params() {
+       for var in $MP_CONFIG_INT $MP_CONFIG_BOOL $MP_CONFIG_STRING; do
+               eval "mp_val=\"\$$var\""
+               [ -n "$mp_val" ] && json_add_string "$var" "$mp_val"
+       done
+}
+
 mac80211_setup_adhoc() {
        local enable=$1
        json_get_vars bssid ssid key mcast_rate
@@ -762,83 +776,215 @@ mac80211_setup_adhoc() {
        mcval=
        [ -n "$mcast_rate" ] && wpa_supplicant_add_rate mcval "$mcast_rate"
 
-       iw dev "$ifname" ibss join "$ssid" $freq $iw_htmode fixed-freq $bssid \
-               beacon-interval $beacon_int \
-               ${brstr:+basic-rates $brstr} \
-               ${mcval:+mcast-rate $mcval} \
-               ${keyspec:+keys $keyspec}
+       local prev
+       json_set_namespace wdev_uc prev
+
+       json_add_object "$ifname"
+       json_add_string mode adhoc
+       [ -n "$default_macaddr" ] || json_add_string macaddr "$macaddr"
+       json_add_string ssid "$ssid"
+       json_add_string freq "$freq"
+       json_add_string htmode "$iw_htmode"
+       [ -n "$bssid" ] && json_add_string bssid "$bssid"
+       json_add_int beacon-interval "$beacon_int"
+       [ -n "$brstr" ] && json_add_string basic-rates "$brstr"
+       [ -n "$mcval" ] && json_add_string mcast-rate "$mcval"
+       [ -n "$keyspec" ] && json_add_string keys "$keyspec"
+       json_close_object
+
+       json_set_namespace "$prev"
 }
 
 mac80211_setup_mesh() {
-       local enable=$1
        json_get_vars ssid mesh_id mcast_rate
 
-       NEWUMLIST="${NEWUMLIST}$ifname "
-
-       [ "$enable" = 0 ] && {
-               ip link set dev "$ifname" down
-               return 0
-       }
-
        mcval=
        [ -n "$mcast_rate" ] && wpa_supplicant_add_rate mcval "$mcast_rate"
        [ -n "$mesh_id" ] && ssid="$mesh_id"
 
-       iw dev "$ifname" mesh join "$ssid" freq $freq $iw_htmode \
-               ${mcval:+mcast-rate $mcval} \
-               beacon-interval $beacon_int
+       local prev
+       json_set_namespace wdev_uc prev
+
+       json_add_object "$ifname"
+       json_add_string mode mesh
+       [ -n "$default_macaddr" ] || json_add_string macaddr "$macaddr"
+       json_add_string ssid "$ssid"
+       json_add_string freq "$freq"
+       json_add_string htmode "$iw_htmode"
+       [ -n "$mcval" ] && json_add_string mcast-rate "$mcval"
+       json_add_int beacon-interval "$beacon_int"
+       mac80211_add_mesh_params
+
+       json_close_object
+
+       json_set_namespace "$prev"
 }
 
-mac80211_setup_vif() {
+mac80211_setup_monitor() {
+       local prev
+       json_set_namespace wdev_uc prev
+
+       json_add_object "$ifname"
+       json_add_string mode monitor
+       [ -n "$freq" ] && json_add_string freq "$freq"
+       json_add_string htmode "$iw_htmode"
+       json_close_object
+
+       json_set_namespace "$prev"
+}
+
+mac80211_set_vif_txpower() {
        local name="$1"
-       local failed
-       local action=up
 
-       json_select data
-       json_get_vars ifname
+       json_select config
+       json_get_var ifname _ifname
+       json_get_vars vif_txpower
        json_select ..
 
-       json_select config
-       json_get_vars mode
-       json_get_var vif_txpower
-       json_get_var vif_enable enable 1
-
-       [ "$vif_enable" = 1 ] || action=down
-       if [ "$mode" != "ap" ] || [ "$ifname" = "$ap_ifname" ]; then
-               ip link set dev "$ifname" "$action" || {
-                       wireless_setup_vif_failed IFUP_ERROR
-                       json_select ..
-                       return
-               }
-               [ -z "$vif_txpower" ] || iw dev "$ifname" set txpower fixed "${vif_txpower%%.*}00"
+       [ -z "$vif_txpower" ] || iw dev "$ifname" set txpower fixed "${vif_txpower%%.*}00"
+}
+
+wpa_supplicant_init_config() {
+       json_set_namespace wpa_supp prev
+
+       json_init
+       json_add_array config
+
+       json_set_namespace "$prev"
+}
+
+wpa_supplicant_add_interface() {
+       local ifname="$1"
+       local mode="$2"
+       local prev
+
+       _wpa_supplicant_common "$ifname"
+
+       json_set_namespace wpa_supp prev
+
+       json_add_object
+       json_add_string ctrl "$_rpath"
+       json_add_string iface "$ifname"
+       json_add_string mode "$mode"
+       json_add_string config "$_config"
+       [ -n "$default_macaddr" ] || json_add_string macaddr "$macaddr"
+       [ -n "$network_bridge" ] && json_add_string bridge "$network_bridge"
+       [ -n "$wds" ] && json_add_boolean 4addr "$wds"
+       json_add_boolean powersave "$powersave"
+       [ "$mode" = "mesh" ] && mac80211_add_mesh_params
+       json_close_object
+
+       json_set_namespace "$prev"
+
+       wpa_supp_init=1
+}
+
+wpa_supplicant_set_config() {
+       local phy="$1"
+       local prev
+
+       json_set_namespace wpa_supp prev
+       json_close_array
+       json_add_string phy "$phy"
+       json_add_boolean defer 1
+       local data="$(json_dump)"
+
+       json_cleanup
+       json_set_namespace "$prev"
+
+       ubus -S -t 0 wait_for wpa_supplicant || {
+               [ -n "$wpa_supp_init" ] || return 0
+
+               ubus wait_for wpa_supplicant
+       }
+
+       local supplicant_res="$(ubus call wpa_supplicant config_set "$data")"
+       ret="$?"
+       [ "$ret" != 0 -o -z "$supplicant_res" ] && wireless_setup_vif_failed WPA_SUPPLICANT_FAILED
+
+       wireless_add_process "$(jsonfilter -s "$supplicant_res" -l 1 -e @.pid)" "/usr/sbin/wpa_supplicant" 1 1
+
+}
+
+hostapd_set_config() {
+       [ -n "$hostapd_ctrl" ] || {
+               ubus call hostapd config_set '{ "phy": "'"$phy"'", "config": "", "prev_config": "'"${hostapd_conf_file}.prev"'" }' > /dev/null
+               return 0;
+       }
+
+       ubus wait_for hostapd
+       local hostapd_res="$(ubus call hostapd config_set "{ \"phy\": \"$phy\", \"config\":\"${hostapd_conf_file}\", \"prev_config\": \"${hostapd_conf_file}.prev\"}")"
+       ret="$?"
+       [ "$ret" != 0 -o -z "$hostapd_res" ] && {
+               wireless_setup_failed HOSTAPD_START_FAILED
+               return
+       }
+       wireless_add_process "$(jsonfilter -s "$hostapd_res" -l 1 -e @.pid)" "/usr/sbin/hostapd" 1 1
+}
+
+
+wpa_supplicant_start() {
+       local phy="$1"
+
+       [ -n "$wpa_supp_init" ] || return 0
+
+       ubus call wpa_supplicant config_set '{ "phy": "'"$phy"'" }' > /dev/null
+}
+
+mac80211_setup_supplicant() {
+       local enable=$1
+       local add_sp=0
+
+       wpa_supplicant_prepare_interface "$ifname" nl80211 || return 1
+
+       if [ "$mode" = "sta" ]; then
+               wpa_supplicant_add_network "$ifname"
+       else
+               wpa_supplicant_add_network "$ifname" "$freq" "$htmode" "$noscan"
        fi
 
+       wpa_supplicant_add_interface "$ifname" "$mode"
+
+       return 0
+}
+
+mac80211_setup_vif() {
+       local name="$1"
+       local failed
+
+       json_select config
+       json_get_var ifname _ifname
+       json_get_var macaddr _macaddr
+       json_get_var default_macaddr _default_macaddr
+       json_get_vars mode wds powersave
+
+       set_default powersave 0
+       set_default wds 0
+
        case "$mode" in
                mesh)
+                       json_get_vars $MP_CONFIG_INT $MP_CONFIG_BOOL $MP_CONFIG_STRING
                        wireless_vif_parse_encryption
                        [ -z "$htmode" ] && htmode="NOHT";
-                       freq="$(get_freq "$phy" "$channel")"
-                       if [ "$wpa" -gt 0 -o "$auto_channel" -gt 0 ] || chan_is_dfs "$phy" "$channel"; then
-                               mac80211_setup_supplicant $vif_enable || failed=1
+                       if wpa_supplicant -vmesh; then
+                               mac80211_setup_supplicant || failed=1
                        else
-                               mac80211_setup_mesh $vif_enable
+                               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"
-                       done
                ;;
                adhoc)
                        wireless_vif_parse_encryption
                        if [ "$wpa" -gt 0 -o "$auto_channel" -gt 0 ]; then
-                               freq="$(get_freq "$phy" "$channel")"
-                               mac80211_setup_supplicant_noctl $vif_enable || failed=1
+                               mac80211_setup_supplicant || failed=1
                        else
-                               mac80211_setup_adhoc $vif_enable
+                               mac80211_setup_adhoc
                        fi
                ;;
                sta)
-                       mac80211_setup_supplicant $vif_enable || failed=1
+                       mac80211_setup_supplicant || failed=1
+               ;;
+               monitor)
+                       mac80211_setup_monitor
                ;;
        esac
 
@@ -848,8 +994,27 @@ mac80211_setup_vif() {
 
 get_freq() {
        local phy="$1"
-       local chan="$2"
-       iw "$phy" info | grep -E -m1 "(\* ${chan:-....} MHz${chan:+|\\[$chan\\]})" | grep MHz | awk '{print $2}'
+       local channel="$2"
+       local band="$3"
+
+       case "$band" in
+               2g) band="1:";;
+               5g) band="2:";;
+               60g) band="3:";;
+               6g) band="4:";;
+       esac
+
+       iw "$phy" info | awk -v band="$band" -v channel="[$channel]" '
+
+$1 ~ /Band/ {
+       band_match = band == $2
+}
+
+band_match && $3 == "MHz" && $4 == channel {
+       print $2
+       exit
+}
+'
 }
 
 chan_is_dfs() {
@@ -859,27 +1024,6 @@ chan_is_dfs() {
        return $!
 }
 
-mac80211_vap_cleanup() {
-       local service="$1"
-       local vaps="$2"
-
-       for wdev in $vaps; do
-               [ "$service" != "none" ] && ubus call ${service} config_remove "{\"iface\":\"$wdev\"}"
-               ip link set dev "$wdev" down 2>/dev/null
-               iw dev "$wdev" del
-       done
-}
-
-mac80211_interface_cleanup() {
-       local phy="$1"
-       local primary_ap=$(uci -q -P /var/state get wireless._${phy}.aplist)
-       primary_ap=${primary_ap%% *}
-
-       mac80211_vap_cleanup hostapd "${primary_ap}"
-       mac80211_vap_cleanup wpa_supplicant "$(uci -q -P /var/state get wireless._${phy}.splist)"
-       mac80211_vap_cleanup none "$(uci -q -P /var/state get wireless._${phy}.umlist)"
-}
-
 mac80211_set_noscan() {
        hostapd_noscan=1
 }
@@ -888,52 +1032,46 @@ drv_mac80211_cleanup() {
        hostapd_common_cleanup
 }
 
+mac80211_reset_config() {
+       local phy="$1"
+
+       hostapd_conf_file="/var/run/hostapd-$phy.conf"
+       ubus call hostapd config_set '{ "phy": "'"$phy"'", "config": "", "prev_config": "'"$hostapd_conf_file"'" }' > /dev/null
+       ubus call wpa_supplicant config_set '{ "phy": "'"$phy"'", "config": [] }' > /dev/null
+       wdev_tool "$phy" set_config '{}'
+}
+
 drv_mac80211_setup() {
        json_select config
        json_get_vars \
                phy macaddr path \
                country chanbw distance \
-               txpower antenna_gain \
+               txpower \
                rxantenna txantenna \
-               frag rts beacon_int:100 htmode
+               frag rts beacon_int:100 htmode \
+               num_global_macaddr:1 multiple_bssid
        json_get_values basic_rate_list basic_rate
+       json_get_values scan_list scan_list
        json_select ..
 
+       json_select data && {
+               json_get_var prev_rxantenna rxantenna
+               json_get_var prev_txantenna txantenna
+               json_select ..
+       }
+
        find_phy || {
                echo "Could not find PHY for device '$1'"
                wireless_set_retry 0
                return 1
        }
 
-       [ -z "$(uci -q -P /var/state show wireless._${phy})" ] && {
-               uci -q -P /var/state set wireless._${phy}=phy
-               wireless_set_data phy="$phy"
-       }
-
-       OLDAPLIST=$(uci -q -P /var/state get wireless._${phy}.aplist)
-       OLDSPLIST=$(uci -q -P /var/state get wireless._${phy}.splist)
-       OLDUMLIST=$(uci -q -P /var/state get wireless._${phy}.umlist)
-
        local wdev
        local cwdev
        local found
 
-       for wdev in $(list_phy_interfaces "$phy"); do
-               found=0
-               for cwdev in $OLDAPLIST $OLDSPLIST $OLDUMLIST; do
-                       if [ "$wdev" = "$cwdev" ]; then
-                               found=1
-                               break
-                       fi
-               done
-               if [ "$found" = "0" ]; then
-                       ip link set dev "$wdev" down
-                       iw dev "$wdev" del
-               fi
-       done
-
        # convert channel to frequency
-       [ "$auto_channel" -gt 0 ] || freq="$(get_freq "$phy" "$channel")"
+       [ "$auto_channel" -gt 0 ] || freq="$(get_freq "$phy" "$channel" "$band")"
 
        [ -n "$country" ] && {
                iw reg get | grep -q "^country $country:" || {
@@ -944,7 +1082,6 @@ drv_mac80211_setup() {
 
        hostapd_conf_file="/var/run/hostapd-$phy.conf"
 
-       no_ap=1
        macidx=0
        staidx=0
 
@@ -957,13 +1094,14 @@ drv_mac80211_setup() {
        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
 
+       [ "$rxantenna" = "$prev_rxantenna" -a "$txantenna" = "$prev_txantenna" ] || mac80211_reset_config "$phy"
+       wireless_set_data phy="$phy" txantenna="$txantenna" rxantenna="$rxantenna"
+
        iw phy "$phy" set antenna $txantenna $rxantenna >/dev/null 2>&1
-       iw phy "$phy" set antenna_gain $antenna_gain >/dev/null 2>&1
        iw phy "$phy" set distance "$distance" >/dev/null 2>&1
 
        if [ -n "$txpower" ]; then
@@ -979,78 +1117,36 @@ drv_mac80211_setup() {
        hostapd_ctrl=
        ap_ifname=
        hostapd_noscan=
+       wpa_supp_init=
        for_each_interface "ap" mac80211_check_ap
 
-       rm -f "$hostapd_conf_file"
+       [ -f "$hostapd_conf_file" ] && mv "$hostapd_conf_file" "$hostapd_conf_file.prev"
 
        for_each_interface "sta adhoc mesh" mac80211_set_noscan
        [ -n "$has_ap" ] && mac80211_hostapd_setup_base "$phy"
 
-       mac80211_prepare_iw_htmode
-       for_each_interface "sta adhoc mesh monitor" mac80211_prepare_vif
-       NEWAPLIST=
-       for_each_interface "ap" mac80211_prepare_vif
-       NEW_MD5=$(test -e "${hostapd_conf_file}" && md5sum ${hostapd_conf_file})
-       OLD_MD5=$(uci -q -P /var/state get wireless._${phy}.md5)
-       if [ "${NEWAPLIST}" != "${OLDAPLIST}" ]; then
-               mac80211_vap_cleanup hostapd "${OLDAPLIST}"
-       fi
-       [ -n "${NEWAPLIST}" ] && mac80211_iw_interface_add "$phy" "${NEWAPLIST%% *}" __ap
-       local add_ap=0
-       local primary_ap=${NEWAPLIST%% *}
-       [ -n "$hostapd_ctrl" ] && {
-               local no_reload=1
-               if [ -n "$(ubus list | grep hostapd.$primary_ap)" ]; then
-                       [ "${NEW_MD5}" = "${OLD_MD5}" ] || {
-                               ubus call hostapd.$primary_ap reload
-                               no_reload=$?
-                               if [ "$no_reload" != "0" ]; then
-                                       mac80211_vap_cleanup hostapd "${OLDAPLIST}"
-                                       mac80211_vap_cleanup wpa_supplicant "$(uci -q -P /var/state get wireless._${phy}.splist)"
-                                       mac80211_vap_cleanup none "$(uci -q -P /var/state get wireless._${phy}.umlist)"
-                                       sleep 2
-                                       mac80211_iw_interface_add "$phy" "${NEWAPLIST%% *}" __ap
-                                       for_each_interface "sta adhoc mesh monitor" mac80211_prepare_vif
-                               fi
-                       }
-               fi
-               if [ "$no_reload" != "0" ]; then
-                       add_ap=1
-                       ubus wait_for hostapd
-                       ubus call hostapd config_add "{\"iface\":\"$primary_ap\", \"config\":\"${hostapd_conf_file}\"}"
-                       local hostapd_pid=$(ubus call service list '{"name": "wpad"}' | jsonfilter -l 1 -e "@['wpad'].instances['hostapd'].pid")
-                       wireless_add_process "$hostapd_pid" "/usr/sbin/hostapd" 1
-               fi
-               ret="$?"
-               [ "$ret" != 0 ] && {
-                       wireless_setup_failed HOSTAPD_START_FAILED
-                       return
-               }
-       }
-       uci -q -P /var/state set wireless._${phy}.aplist="${NEWAPLIST}"
-       uci -q -P /var/state set wireless._${phy}.md5="${NEW_MD5}"
+       local prev
+       json_set_namespace wdev_uc prev
+       json_init
+       json_set_namespace "$prev"
+
+       wpa_supplicant_init_config
 
-       [ "${add_ap}" = 1 ] && sleep 1
-       for_each_interface "ap" mac80211_setup_vif
+       mac80211_prepare_iw_htmode
+       active_ifnames=
+       for_each_interface "ap sta adhoc mesh monitor" mac80211_prepare_vif
+       for_each_interface "ap sta adhoc mesh monitor" mac80211_setup_vif
 
-       NEWSPLIST=
-       NEWUMLIST=
+       [ -x /usr/sbin/wpa_supplicant ] && wpa_supplicant_set_config "$phy"
+       [ -x /usr/sbin/hostapd ] && hostapd_set_config "$phy"
 
-       for_each_interface "sta adhoc mesh monitor" mac80211_setup_vif
+       [ -x /usr/sbin/wpa_supplicant ] && wpa_supplicant_start "$phy"
 
-       uci -q -P /var/state set wireless._${phy}.splist="${NEWSPLIST}"
-       uci -q -P /var/state set wireless._${phy}.umlist="${NEWUMLIST}"
+       json_set_namespace wdev_uc prev
+       wdev_tool "$phy" set_config "$(json_dump)" $active_ifnames
+       json_set_namespace "$prev"
 
-       local foundvap
-       local dropvap=""
-       for oldvap in $OLDSPLIST; do
-               foundvap=0
-               for newvap in $NEWSPLIST; do
-                       [ "$oldvap" = "$newvap" ] && foundvap=1
-               done
-               [ "$foundvap" = "0" ] && dropvap="$dropvap $oldvap"
-       done
-       [ -n "$dropvap" ] && mac80211_vap_cleanup wpa_supplicant "$dropvap"
+       for_each_interface "ap sta adhoc mesh monitor" mac80211_set_vif_txpower
        wireless_set_up
 }
 
@@ -1076,9 +1172,17 @@ drv_mac80211_teardown() {
        json_select data
        json_get_vars phy
        json_select ..
+       [ -n "$phy" ] || {
+               echo "Bug: PHY is undefined for device '$1'"
+               return 1
+       }
 
-       mac80211_interface_cleanup "$phy"
-       uci -q -P /var/state revert wireless._${phy}
+       mac80211_reset_config "$phy"
+
+       for wdev in $(list_phy_interfaces "$phy"); do
+               ip link set dev "$wdev" down
+               iw dev "$wdev" del
+       done
 }
 
 add_driver mac80211