merge mac80211, iw, hostapd from trunk to backfire
[openwrt/svn-archive/archive.git] / package / hostapd / patches / 451-nl80211_del_beacon_bss.patch
1 --- a/src/drivers/driver_nl80211.c
2 +++ b/src/drivers/driver_nl80211.c
3 @@ -1604,23 +1604,41 @@ wpa_driver_nl80211_finish_drv_init(struc
4 }
5
6
7 -static int wpa_driver_nl80211_del_beacon(struct wpa_driver_nl80211_data *drv)
8 +static int wpa_driver_nl80211_del_bss_beacon(struct i802_bss *bss)
9 {
10 + struct wpa_driver_nl80211_data *drv = bss->drv;
11 struct nl_msg *msg;
12
13 + bss->beacon_set = 0;
14 +
15 msg = nlmsg_alloc();
16 if (!msg)
17 return -ENOMEM;
18
19 genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
20 0, NL80211_CMD_DEL_BEACON, 0);
21 - NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
22 + NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, bss->ifindex);
23
24 return send_and_recv_msgs(drv, msg, NULL, NULL);
25 nla_put_failure:
26 + nlmsg_free(msg);
27 return -ENOBUFS;
28 }
29
30 +static int wpa_driver_nl80211_del_beacon(struct wpa_driver_nl80211_data *drv)
31 +{
32 + struct i802_bss *bss;
33 +
34 + for (bss = &drv->first_bss; bss; bss = bss->next)
35 + wpa_driver_nl80211_del_bss_beacon(bss);
36 +}
37 +
38 +static int wpa_driver_nl80211_stop_ap(void *priv)
39 +{
40 + struct i802_bss *bss = priv;
41 +
42 + wpa_driver_nl80211_del_beacon(bss->drv);
43 +}
44
45 /**
46 * wpa_driver_nl80211_deinit - Deinitialize nl80211 driver interface
47 @@ -5512,4 +5530,5 @@ const struct wpa_driver_ops wpa_driver_n
48 .send_ft_action = nl80211_send_ft_action,
49 .signal_monitor = nl80211_signal_monitor,
50 .send_frame = nl80211_send_frame,
51 + .stop_ap = wpa_driver_nl80211_stop_ap,
52 };
53 --- a/src/drivers/driver.h
54 +++ b/src/drivers/driver.h
55 @@ -1774,6 +1774,8 @@ struct wpa_driver_ops {
56 */
57 int (*send_frame)(void *priv, const u8 *data, size_t data_len,
58 int encrypt);
59 +
60 + int (*stop_ap)(void *priv);
61 };
62
63