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

[Sergej Pupykin]

    Date: Tuesday, October 4, 2016 @ 18:20:10
  Author: spupykin
Revision: 191334

upgpkg: hostapd 2.6-2

upd

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

--------------------------+
 PKGBUILD                 |    6 +++---
 hostapd-2.3-noscan.patch |   40 ++++++++++++++++++++++------------------
 2 files changed, 25 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-04 17:46:39 UTC (rev 191333)
+++ PKGBUILD	2016-10-04 18:20:10 UTC (rev 191334)
@@ -3,7 +3,7 @@
 
 pkgname=hostapd
 pkgver=2.6
-pkgrel=1
+pkgrel=2
 pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 arch=('i686' 'x86_64')
 url="http://w1.fi/hostapd/"
@@ -19,12 +19,12 @@
 md5sums=('eaa56dce9bd8f1d195eb62596eab34c7'
          '43c0ec1d8b4d4e46f468bc161bb05c4b'
          '380042b9cf4950e34ed34b3093ab9e7f'
-         'eaf8e48a9a63b5902fddadff2b8933fa'
+         'f3875fc2ac90d9b99501d690a0988857'
          'a0802a604ed957078da0e14863df74f0')
 
 prepare() {
   cd $pkgname-$pkgver
-#  patch -p1 <$srcdir/hostapd-2.3-noscan.patch
+  patch -p1 <$srcdir/hostapd-2.3-noscan.patch
   patch -p1 <$srcdir/openvswitch.patch
 }
 

Modified: hostapd-2.3-noscan.patch
===================================================================
--- hostapd-2.3-noscan.patch	2016-10-04 17:46:39 UTC (rev 191333)
+++ hostapd-2.3-noscan.patch	2016-10-04 18:20:10 UTC (rev 191334)
@@ -1,6 +1,7 @@
---- a/hostapd/config_file.c
-+++ b/hostapd/config_file.c
-@@ -2639,6 +2639,8 @@ static int hostapd_config_fill(struct ho
+diff -wbBur hostapd-2.6/hostapd/config_file.c hostapd-2.6.my/hostapd/config_file.c
+--- hostapd-2.6/hostapd/config_file.c	2016-10-02 21:51:11.000000000 +0300
++++ hostapd-2.6.my/hostapd/config_file.c	2016-10-04 21:14:04.986440035 +0300
+@@ -2863,6 +2863,8 @@
  		}
  #endif /* CONFIG_IEEE80211W */
  #ifdef CONFIG_IEEE80211N
@@ -9,9 +10,10 @@
  	} 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 {
+diff -wbBur hostapd-2.6/src/ap/ap_config.h hostapd-2.6.my/src/ap/ap_config.h
+--- hostapd-2.6/src/ap/ap_config.h	2016-10-02 21:51:11.000000000 +0300
++++ hostapd-2.6.my/src/ap/ap_config.h	2016-10-04 21:14:04.986440035 +0300
+@@ -664,6 +664,7 @@
  
  	int ht_op_mode_fixed;
  	u16 ht_capab;
@@ -18,21 +20,23 @@
 +	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;
+ 	int no_pri_sec_switch;
+diff -wbBur hostapd-2.6/src/ap/hw_features.c hostapd-2.6.my/src/ap/hw_features.c
+--- hostapd-2.6/src/ap/hw_features.c	2016-10-02 21:51:11.000000000 +0300
++++ hostapd-2.6.my/src/ap/hw_features.c	2016-10-04 21:15:19.323105847 +0300
+@@ -226,7 +226,7 @@
+ {
+ 	int pri_chan, sec_chan;
  
 -	if (!iface->conf->secondary_channel)
 +	if (!iface->conf->secondary_channel || iface->conf->noscan)
- 		return 0; /* HT40 not used */
+ 		return 1; /* 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
+ 	pri_chan = iface->conf->channel;
+diff -wbBur hostapd-2.6/src/ap/ieee802_11_ht.c hostapd-2.6.my/src/ap/ieee802_11_ht.c
+--- hostapd-2.6/src/ap/ieee802_11_ht.c	2016-10-02 21:51:11.000000000 +0300
++++ hostapd-2.6.my/src/ap/ieee802_11_ht.c	2016-10-04 21:14:04.989773368 +0300
+@@ -244,6 +244,9 @@
  	if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET))
  		return;
  
@@ -42,7 +46,7 @@
  	if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie))
  		return;
  
-@@ -317,6 +320,9 @@ void ht40_intolerant_add(struct hostapd_
+@@ -368,6 +371,9 @@
  	if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
  		return;