hostapd: update to 2023-03-29

[openwrt/staging/wigyori.git] / package / network / services / hostapd / patches / 350-nl80211_del_beacon_bss.patch

diff --git a/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch b/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch
index a88b63e913d2654c32d8cb91033aaa8e25dabaca..a943395b5640abce3c71dab717afa33387be2c13 100644 (file)
--- a/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch
+++ b/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch
@@ -1,34 +1,35 @@
 --- a/src/drivers/driver_nl80211.c
 +++ b/src/drivers/driver_nl80211.c
-@@ -2938,11 +2938,11 @@ static int wpa_driver_nl80211_del_beacon
-       struct wpa_driver_nl80211_data *drv = bss->drv;
+@@ -3006,12 +3006,12 @@ static int wpa_driver_nl80211_del_beacon
+               return 0;
  
        wpa_printf(MSG_DEBUG, "nl80211: Remove beacon (ifindex=%d)",
 -                 drv->ifindex);
 +                 bss->ifindex);
-       bss->beacon_set = 0;
-       bss->freq = 0;
+       link->beacon_set = 0;
+       link->freq = 0;
+ 
        nl80211_put_wiphy_data_ap(bss);
 -      msg = nl80211_drv_msg(drv, 0, NL80211_CMD_DEL_BEACON);
 +      msg = nl80211_bss_msg(bss, 0, NL80211_CMD_DEL_BEACON);
-       return send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL);
- }
+       if (!msg)
+               return -ENOBUFS;
  
-@@ -5661,7 +5661,7 @@ static void nl80211_teardown_ap(struct i
+@@ -5907,7 +5907,7 @@ static void nl80211_teardown_ap(struct i
                nl80211_mgmt_unsubscribe(bss, "AP teardown");
  
        nl80211_put_wiphy_data_ap(bss);
--      bss->beacon_set = 0;
-+      wpa_driver_nl80211_del_beacon(bss);
+-      bss->flink->beacon_set = 0;
++      wpa_driver_nl80211_del_beacon_all(bss);
  }
  
  
-@@ -8120,8 +8120,6 @@ static int wpa_driver_nl80211_if_remove(
+@@ -8642,8 +8642,6 @@ static int wpa_driver_nl80211_if_remove(
        } else {
                wpa_printf(MSG_DEBUG, "nl80211: First BSS - reassign context");
                nl80211_teardown_ap(bss);
 -              if (!bss->added_if && !drv->first_bss->next)
--                      wpa_driver_nl80211_del_beacon(bss);
+-                      wpa_driver_nl80211_del_beacon_all(bss);
                nl80211_destroy_bss(bss);
                if (!bss->added_if)
                        i802_set_iface_flags(bss, 0);