[openwrt/openwrt] hostapd: fix broke noscan option for mesh

LEDE Commits lede-commits at lists.infradead.org
Thu Nov 9 07:42:31 PST 2023


ansuel pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/64907f3c34e2c1b59a6f8afe7cab5da1befea54f

commit 64907f3c34e2c1b59a6f8afe7cab5da1befea54f
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Wed Nov 8 16:46:12 2023 +0100

    hostapd: fix broke noscan option for mesh
    
    noscan option for mesh was broken and actually never applied.
    
    This is caused by a typo where ssid->noscan value is check instead of
    conf->noscan resulting in the logic swapped and broken.
    
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
    (cherry picked from commit 1b5ea2e199fcf391f88afd0322de449459399be4)
    [ rework for openwrt-22.03 ]
---
 package/network/services/hostapd/Makefile                      | 2 +-
 package/network/services/hostapd/patches/301-mesh-noscan.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index a06f6a0523..f831304dcd 100644
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd
-PKG_RELEASE:=$(AUTORELEASE).2
+PKG_RELEASE:=$(AUTORELEASE).3
 
 PKG_SOURCE_URL:=http://w1.fi/hostap.git
 PKG_SOURCE_PROTO:=git
diff --git a/package/network/services/hostapd/patches/301-mesh-noscan.patch b/package/network/services/hostapd/patches/301-mesh-noscan.patch
index e682efb543..b27ffc4493 100644
--- a/package/network/services/hostapd/patches/301-mesh-noscan.patch
+++ b/package/network/services/hostapd/patches/301-mesh-noscan.patch
@@ -24,8 +24,8 @@
  			   frequency);
  		goto out_free;
  	}
-+	if (ssid->noscan)
-+		conf->noscan = 1;
++	if (conf->noscan)
++		ssid->noscan = 1;
  
  	if (ssid->mesh_basic_rates == NULL) {
  		/*




More information about the lede-commits mailing list