ath9k: fix another tx locking issue

[openwrt.git] / package / hostapd / patches / 551-nl80211_del_beacon_bss.patch

diff --git a/package/hostapd/patches/551-nl80211_del_beacon_bss.patch b/package/hostapd/patches/551-nl80211_del_beacon_bss.patch
index a4cf619..3728bed 100644 (file)
--- a/package/hostapd/patches/551-nl80211_del_beacon_bss.patch
+++ b/package/hostapd/patches/551-nl80211_del_beacon_bss.patch
@@ -1,6 +1,6 @@
 --- a/src/drivers/driver_nl80211.c
 +++ b/src/drivers/driver_nl80211.c
 --- a/src/drivers/driver_nl80211.c
 +++ b/src/drivers/driver_nl80211.c

-@@ -2092,23 +2092,41 @@ wpa_driver_nl80211_finish_drv_init(struc
+@@ -2532,22 +2532,41 @@ wpa_driver_nl80211_finish_drv_init(struc

  }
  
  
  }
  
  


@@ -11,13 +11,11 @@
        struct nl_msg *msg;
  
 +      bss->beacon_set = 0;
        struct nl_msg *msg;
  
 +      bss->beacon_set = 0;

-+

        msg = nlmsg_alloc();
        if (!msg)
                return -ENOMEM;
  
        msg = nlmsg_alloc();
        if (!msg)
                return -ENOMEM;
  

-       genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
-                   0, NL80211_CMD_DEL_BEACON, 0);
+       nl80211_cmd(drv, msg, 0, NL80211_CMD_DEL_BEACON);

 -      NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
 +      NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, bss->ifindex);
  
 -      NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
 +      NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, bss->ifindex);
  


@@ -33,29 +31,31 @@
 +
 +      for (bss = &drv->first_bss; bss; bss = bss->next)
 +              wpa_driver_nl80211_del_bss_beacon(bss);
 +
 +      for (bss = &drv->first_bss; bss; bss = bss->next)
 +              wpa_driver_nl80211_del_bss_beacon(bss);

++
++      return 0;

 +}
 +
 +static int wpa_driver_nl80211_stop_ap(void *priv)
 +{
 +      struct i802_bss *bss = priv;
 +
 +}
 +
 +static int wpa_driver_nl80211_stop_ap(void *priv)
 +{
 +      struct i802_bss *bss = priv;
 +

-+      wpa_driver_nl80211_del_beacon(bss->drv);
++      return wpa_driver_nl80211_del_beacon(bss->drv);

 +}
  
  /**
   * wpa_driver_nl80211_deinit - Deinitialize nl80211 driver interface
 +}
  
  /**
   * wpa_driver_nl80211_deinit - Deinitialize nl80211 driver interface

-@@ -6581,4 +6599,5 @@ const struct wpa_driver_ops wpa_driver_n
-       .set_intra_bss = nl80211_set_intra_bss,
-       .set_param = nl80211_set_param,
-       .get_radio_name = nl80211_get_radio_name,
+@@ -7654,4 +7673,5 @@ const struct wpa_driver_ops wpa_driver_n
+       .send_tdls_mgmt = nl80211_send_tdls_mgmt,
+       .tdls_oper = nl80211_tdls_oper,
+ #endif /* CONFIG_TDLS */

 +      .stop_ap = wpa_driver_nl80211_stop_ap,
  };
 --- a/src/drivers/driver.h
 +++ b/src/drivers/driver.h
 +      .stop_ap = wpa_driver_nl80211_stop_ap,
  };
 --- a/src/drivers/driver.h
 +++ b/src/drivers/driver.h

-@@ -2241,6 +2241,8 @@ struct wpa_driver_ops {
-        * @signal_info: Connection info structure
-          */
-       int (*signal_poll)(void *priv, struct wpa_signal_info *signal_info);
+@@ -2452,6 +2452,8 @@ struct wpa_driver_ops {
+        */
+       void (*poll_client)(void *priv, const u8 *own_addr,
+                           const u8 *addr, int qos);

 +
 +      int (*stop_ap)(void *priv);
  };
 +
 +      int (*stop_ap)(void *priv);
  };