aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/hostapd/patches/300-noscan.patch
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2018-05-31 00:10:49 +0200
committerDaniel Golle <daniel@makrotopia.org>2018-05-31 00:38:16 +0200
commit78f1974bc565d7544589a49ad8efd92c4ddec5b3 (patch)
tree2ba738d93778958d880ed37896c2bb617f19b9e1 /package/network/services/hostapd/patches/300-noscan.patch
parentdad39249fb91d6f320256ac12944863f09bb2dc9 (diff)
downloadupstream-78f1974bc565d7544589a49ad8efd92c4ddec5b3.tar.gz
upstream-78f1974bc565d7544589a49ad8efd92c4ddec5b3.tar.bz2
upstream-78f1974bc565d7544589a49ad8efd92c4ddec5b3.zip
hostapd: update packaging and patches
Clean up conflicts/provides/depends hell and add PROVIDES for eapol-test variants while at it. Update mesh-DFS patchset from Peter Oh to v5 (with local fixes) which allows to drop two revert-patches for upstream commits which previously were necessary to un-break mesh-DFS support. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'package/network/services/hostapd/patches/300-noscan.patch')
-rw-r--r--package/network/services/hostapd/patches/300-noscan.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/network/services/hostapd/patches/300-noscan.patch b/package/network/services/hostapd/patches/300-noscan.patch
index ba0069fa51..4463c75c91 100644
--- a/package/network/services/hostapd/patches/300-noscan.patch
+++ b/package/network/services/hostapd/patches/300-noscan.patch
@@ -1,6 +1,6 @@
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
-@@ -3159,6 +3159,10 @@ static int hostapd_config_fill(struct ho
+@@ -3214,6 +3214,10 @@ static int hostapd_config_fill(struct ho
}
#endif /* CONFIG_IEEE80211W */
#ifdef CONFIG_IEEE80211N
@@ -13,7 +13,7 @@
} else if (os_strcmp(buf, "ht_capab") == 0) {
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
-@@ -769,6 +769,8 @@ struct hostapd_config {
+@@ -775,6 +775,8 @@ struct hostapd_config {
int ht_op_mode_fixed;
u16 ht_capab;