From 716ca530e1c4515d8683c9d5be3d56b301758b66 Mon Sep 17 00:00:00 2001
From: James <>
Date: Wed, 4 Nov 2015 11:49:21 +0000
Subject: trunk-47381

---
 .../patches/350-nl80211_del_beacon_bss.patch       | 72 ++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch

(limited to '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
new file mode 100644
index 0000000..a14fa03
--- /dev/null
+++ b/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch
@@ -0,0 +1,72 @@
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -2254,13 +2254,18 @@ 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_beacon(struct i802_bss *bss)
+ {
++	struct wpa_driver_nl80211_data *drv = bss->drv;
+ 	struct nl_msg *msg;
+ 
++	if (!bss->beacon_set)
++		return 0;
++
++	bss->beacon_set = 0;
+ 	wpa_printf(MSG_DEBUG, "nl80211: Remove beacon (ifindex=%d)",
+-		   drv->ifindex);
+-	msg = nl80211_drv_msg(drv, 0, NL80211_CMD_DEL_BEACON);
++		   bss->ifindex);
++	msg = nl80211_bss_msg(bss, 0, NL80211_CMD_DEL_BEACON);
+ 	return send_and_recv_msgs(drv, msg, NULL, NULL);
+ }
+ 
+@@ -2311,7 +2316,7 @@ static void wpa_driver_nl80211_deinit(st
+ 	nl80211_remove_monitor_interface(drv);
+ 
+ 	if (is_ap_interface(drv->nlmode))
+-		wpa_driver_nl80211_del_beacon(drv);
++		wpa_driver_nl80211_del_beacon(bss);
+ 
+ 	if (drv->eapol_sock >= 0) {
+ 		eloop_unregister_read_sock(drv->eapol_sock);
+@@ -4140,8 +4145,7 @@ static void nl80211_teardown_ap(struct i
+ 		nl80211_remove_monitor_interface(drv);
+ 	else
+ 		nl80211_mgmt_unsubscribe(bss, "AP teardown");
+-
+-	bss->beacon_set = 0;
++	wpa_driver_nl80211_del_beacon(bss);
+ }
+ 
+ 
+@@ -6066,8 +6070,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(drv);
+ 		nl80211_destroy_bss(bss);
+ 		if (!bss->added_if)
+ 			i802_set_iface_flags(bss, 0);
+@@ -6389,8 +6391,7 @@ static int wpa_driver_nl80211_deinit_ap(
+ 	struct wpa_driver_nl80211_data *drv = bss->drv;
+ 	if (!is_ap_interface(drv->nlmode))
+ 		return -1;
+-	wpa_driver_nl80211_del_beacon(drv);
+-	bss->beacon_set = 0;
++	wpa_driver_nl80211_del_beacon(bss);
+ 
+ 	/*
+ 	 * If the P2P GO interface was dynamically added, then it is
+@@ -6409,8 +6410,7 @@ static int wpa_driver_nl80211_stop_ap(vo
+ 	struct wpa_driver_nl80211_data *drv = bss->drv;
+ 	if (!is_ap_interface(drv->nlmode))
+ 		return -1;
+-	wpa_driver_nl80211_del_beacon(drv);
+-	bss->beacon_set = 0;
++	wpa_driver_nl80211_del_beacon(bss);
+ 	return 0;
+ }
+ 
-- 
cgit v1.2.3