projects
/
15.05
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hostapd: fix multi-ssid and AP+STA, clean up code
[15.05/openwrt.git]
/
package
/
network
/
services
/
hostapd
/
patches
/
540-dynamic_20_40_mhz.patch
diff --git
a/package/network/services/hostapd/patches/540-dynamic_20_40_mhz.patch
b/package/network/services/hostapd/patches/540-dynamic_20_40_mhz.patch
index
ce2a339
..
a71f560
100644
(file)
--- a/
package/network/services/hostapd/patches/540-dynamic_20_40_mhz.patch
+++ b/
package/network/services/hostapd/patches/540-dynamic_20_40_mhz.patch
@@
-1,6
+1,6
@@
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
-@@ -24
74,6 +2474
,10 @@ static int hostapd_config_fill(struct ho
+@@ -24
88,6 +2488
,10 @@ static int hostapd_config_fill(struct ho
"ht_capab", line);
errors++;
}
"ht_capab", line);
errors++;
}
@@
-13,7
+13,7
@@
#endif /* CONFIG_IEEE80211N */
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
#endif /* CONFIG_IEEE80211N */
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
-@@ -51
4,6 +514
,7 @@ struct hostapd_config {
+@@ -51
9,6 +519
,7 @@ struct hostapd_config {
int ieee80211n;
int secondary_channel;
int require_ht;
int ieee80211n;
int secondary_channel;
int require_ht;
@@
-31,7
+31,7
@@
#include "ieee802_11_auth.h"
#include "vlan_init.h"
#include "wpa_auth.h"
#include "ieee802_11_auth.h"
#include "vlan_init.h"
#include "wpa_auth.h"
-@@ -3
32,6 +333
,7 @@ static void hostapd_cleanup_iface_pre(st
+@@ -3
43,6 +344
,7 @@ static void hostapd_cleanup_iface_pre(st
static void hostapd_cleanup_iface_partial(struct hostapd_iface *iface)
{
static void hostapd_cleanup_iface_partial(struct hostapd_iface *iface)
{
@@
-41,7
+41,7
@@
os_free(iface->current_rates);
--- a/src/ap/hostapd.h
+++ b/src/ap/hostapd.h
os_free(iface->current_rates);
--- a/src/ap/hostapd.h
+++ b/src/ap/hostapd.h
-@@ -2
65,6 +265
,9 @@ struct hostapd_iface {
+@@ -2
74,6 +274
,9 @@ struct hostapd_iface {
/* Overlapping BSS information */
int olbc_ht;
/* Overlapping BSS information */
int olbc_ht;
@@
-53,7
+53,7
@@
};
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
};
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
-@@ -1
484,6 +1484
,9 @@ static void handle_beacon(struct hostapd
+@@ -1
513,6 +1513
,9 @@ static void handle_beacon(struct hostapd
sizeof(mgmt->u.beacon)), &elems,
0);
sizeof(mgmt->u.beacon)), &elems,
0);