backport mac80211, hostapd, iw, crda from trunk as of r26369

[openwrt-10.03/.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
new file mode 100644 (file)
index 0000000..bd71a7b
--- /dev/null
+++ b/package/hostapd/patches/551-nl80211_del_beacon_bss.patch
@@ -0,0 +1,63 @@
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -2065,23 +2065,41 @@ wpa_driver_nl80211_finish_drv_init(struc
+ }
+ 
+ 
+-static int wpa_driver_nl80211_del_beacon(struct wpa_driver_nl80211_data *drv)
++static int wpa_driver_nl80211_del_bss_beacon(struct i802_bss *bss)
+ {
++      struct wpa_driver_nl80211_data *drv = bss->drv;
+       struct nl_msg *msg;
+ 
++      bss->beacon_set = 0;
++
+       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);
+-      NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
++      NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, bss->ifindex);
+ 
+       return send_and_recv_msgs(drv, msg, NULL, NULL);
+  nla_put_failure:
++      nlmsg_free(msg);
+       return -ENOBUFS;
+ }
+ 
++static int wpa_driver_nl80211_del_beacon(struct wpa_driver_nl80211_data *drv)
++{
++      struct i802_bss *bss;
++
++      for (bss = &drv->first_bss; bss; bss = bss->next)
++              wpa_driver_nl80211_del_bss_beacon(bss);
++}
++
++static int wpa_driver_nl80211_stop_ap(void *priv)
++{
++      struct i802_bss *bss = priv;
++
++      wpa_driver_nl80211_del_beacon(bss->drv);
++}
+ 
+ /**
+  * wpa_driver_nl80211_deinit - Deinitialize nl80211 driver interface
+@@ -6529,4 +6547,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,
++      .stop_ap = wpa_driver_nl80211_stop_ap,
+ };
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -2217,6 +2217,8 @@ struct wpa_driver_ops {
+                             const u8 *buf, size_t len);
+ 
+       int (*tdls_oper)(void *priv, enum tdls_oper oper, const u8 *peer);
++
++      int (*stop_ap)(void *priv);
+ };
+ 
+