[arch-commits] Commit in hostapd/trunk (PKGBUILD hostapd-2.3-noscan.patch)

[Sergej Pupykin]

    Date: Thursday, February 26, 2015 @ 18:06:01
  Author: spupykin
Revision: 128294

upgpkg: hostapd 2.3-4

upd

Added:
  hostapd/trunk/hostapd-2.3-noscan.patch
Modified:
  hostapd/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   13 ++++++++--
 hostapd-2.3-noscan.patch |   54 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-26 17:05:57 UTC (rev 128293)
+++ PKGBUILD	2015-02-26 17:06:01 UTC (rev 128294)
@@ -3,7 +3,7 @@
 
 pkgname=hostapd
 pkgver=2.3
-pkgrel=3
+pkgrel=4
 pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 arch=('i686' 'x86_64')
 url="http://w1.fi/hostapd/"
@@ -13,11 +13,18 @@
 options=(emptydirs)
 source=(http://w1.fi/releases/$pkgname-$pkgver.tar.gz
 	config
-	hostapd.service)
+	hostapd.service
+	hostapd-2.3-noscan.patch)
 md5sums=('40b89c61036add0c2dd1fc10767d3b5f'
          '72e8ecf8fadf8b06d87876ea8c3dfd07'
-         '380042b9cf4950e34ed34b3093ab9e7f')
+         '380042b9cf4950e34ed34b3093ab9e7f'
+         'f2f13cf359735ba0ab7bad7690101b60')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 <$srcdir/hostapd-2.3-noscan.patch
+}
+
 build() {
   cd $pkgname-$pkgver/hostapd
   cp ../../config .config

Added: hostapd-2.3-noscan.patch
===================================================================
--- hostapd-2.3-noscan.patch	                        (rev 0)
+++ hostapd-2.3-noscan.patch	2015-02-26 17:06:01 UTC (rev 128294)
@@ -0,0 +1,54 @@
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -2639,6 +2639,8 @@ static int hostapd_config_fill(struct ho
+ 		}
+ #endif /* CONFIG_IEEE80211W */
+ #ifdef CONFIG_IEEE80211N
++	} else if (os_strcmp(buf, "noscan") == 0) {
++		conf->noscan = atoi(pos);
+ 	} else if (os_strcmp(buf, "ieee80211n") == 0) {
+ 		conf->ieee80211n = atoi(pos);
+ 	} else if (os_strcmp(buf, "ht_capab") == 0) {
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -576,6 +576,7 @@ struct hostapd_config {
+ 
+ 	int ht_op_mode_fixed;
+ 	u16 ht_capab;
++	int noscan;
+ 	int ieee80211n;
+ 	int secondary_channel;
+ 	int require_ht;
+--- a/src/ap/hw_features.c
++++ b/src/ap/hw_features.c
+@@ -690,7 +690,7 @@ static int ieee80211n_check_40mhz(struct
+ 	struct wpa_driver_scan_params params;
+ 	int ret;
+ 
+-	if (!iface->conf->secondary_channel)
++	if (!iface->conf->secondary_channel || iface->conf->noscan)
+ 		return 0; /* HT40 not used */
+ 
+ 	hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
+--- a/src/ap/ieee802_11_ht.c
++++ b/src/ap/ieee802_11_ht.c
+@@ -220,6 +220,9 @@ void hostapd_2040_coex_action(struct hos
+ 	if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET))
+ 		return;
+ 
++	if (iface->conf->noscan)
++		return;
++
+ 	if (len < IEEE80211_HDRLEN + 1)
+ 		return;
+ 	data++;
+@@ -317,6 +320,9 @@ void ht40_intolerant_add(struct hostapd_
+ 	if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
+ 		return;
+ 
++	if (iface->conf->noscan)
++		return;
++
+ 	wpa_printf(MSG_INFO, "HT: Forty MHz Intolerant is set by STA " MACSTR
+ 		   " in Association Request", MAC2STR(sta->addr));
+