projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hostapd: update to version 2016-06-15
[openwrt/openwrt.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 2bcf49a7c62e221b6c913b0008b324ea34346de0..247f154e3059aaf25df321b496ff255b50b8ddf4 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,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
-@@ -23
24,13 +232
4,18 @@ wpa_driver_nl80211_finish_drv_init(struc
+@@ -23
94,13 +239
4,18 @@ wpa_driver_nl80211_finish_drv_init(struc
}
}
@@
-22,7
+22,7
@@
return send_and_recv_msgs(drv, msg, NULL, NULL);
}
return send_and_recv_msgs(drv, msg, NULL, NULL);
}
-@@ -2
381,7 +2386
,7 @@ static void wpa_driver_nl80211_deinit(st
+@@ -2
452,7 +2457
,7 @@ static void wpa_driver_nl80211_deinit(st
nl80211_remove_monitor_interface(drv);
if (is_ap_interface(drv->nlmode))
nl80211_remove_monitor_interface(drv);
if (is_ap_interface(drv->nlmode))
@@
-31,7
+31,7
@@
if (drv->eapol_sock >= 0) {
eloop_unregister_read_sock(drv->eapol_sock);
if (drv->eapol_sock >= 0) {
eloop_unregister_read_sock(drv->eapol_sock);
-@@ -4
233,8 +4238
,7 @@ static void nl80211_teardown_ap(struct i
+@@ -4
385,8 +4390
,7 @@ static void nl80211_teardown_ap(struct i
nl80211_remove_monitor_interface(drv);
else
nl80211_mgmt_unsubscribe(bss, "AP teardown");
nl80211_remove_monitor_interface(drv);
else
nl80211_mgmt_unsubscribe(bss, "AP teardown");
@@
-41,7
+41,7
@@
}
}
-@@ -6
165,8 +6169
,6 @@ static int wpa_driver_nl80211_if_remove(
+@@ -6
387,8 +6391
,6 @@ static int wpa_driver_nl80211_if_remove(
} else {
wpa_printf(MSG_DEBUG, "nl80211: First BSS - reassign context");
nl80211_teardown_ap(bss);
} else {
wpa_printf(MSG_DEBUG, "nl80211: First BSS - reassign context");
nl80211_teardown_ap(bss);
@@
-50,7
+50,7
@@
nl80211_destroy_bss(bss);
if (!bss->added_if)
i802_set_iface_flags(bss, 0);
nl80211_destroy_bss(bss);
if (!bss->added_if)
i802_set_iface_flags(bss, 0);
-@@ -6
528,8 +6530
,7 @@ static int wpa_driver_nl80211_deinit_ap(
+@@ -6
750,8 +6752
,7 @@ static int wpa_driver_nl80211_deinit_ap(
struct wpa_driver_nl80211_data *drv = bss->drv;
if (!is_ap_interface(drv->nlmode))
return -1;
struct wpa_driver_nl80211_data *drv = bss->drv;
if (!is_ap_interface(drv->nlmode))
return -1;
@@
-60,7
+60,7
@@
/*
* If the P2P GO interface was dynamically added, then it is
/*
* If the P2P GO interface was dynamically added, then it is
-@@ -6
548,8 +6549
,7 @@ static int wpa_driver_nl80211_stop_ap(vo
+@@ -6
770,8 +6771
,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;
struct wpa_driver_nl80211_data *drv = bss->drv;
if (!is_ap_interface(drv->nlmode))
return -1;