Squashed update to ol_R5.SP5.01

924fc97 WPS: Select only correct AP following provisioning (UPSTREAM)
0225e1b wpa_s/hostapd: add description to version string
96f59d8 hostapd: template function for auto-selection of channel (INTERNAL)
c5f4bec hostapd: re-use auto-select scan result for 40Mhz pre-scan (INTERNAL)
8c1b10e hostapd: auto-select AP channel (INTERNAL)
7d2c675 hostapd: auto-select secondary channel (INTERNAL)
586ba7c hostapd: add support for ACS whitelist and blacklist (INTERNAL)
5f65e16 wpa_s: new override_p2p_go_intent conf parameter (INTERNAL)
172d2b2 P2P: accept provision discovery with bcast group ID
7190ff7 P2P: wait on GO negotiation confirm

Original commits from:
https://github.com/TI-OpenLink/hostap/commits/ol_R5.SP5.01

Change-Id: I2d4fbaee04a0c8785e4c4b8a1333f4aff7204cc9

Author: mikeNG

hostapd/Makefile

@@ -8,6 +8,7 @@ endif
 
 CFLAGS += -I../src
 CFLAGS += -I../src/utils
+CFLAGS += -DVERSION_STR_POSTFIX=\"-$(shell git describe)\"
 
 # Uncomment following line and set the path to your kernel tree include
 # directory if your C library does not include all header files.

hostapd/config_file.c

@@ -2016,6 +2016,20 @@ static int hostapd_config_fill(struct hostapd_config *conf,
 					   "list", line);
 				errors++;
 			}
+		} else if (os_strcmp(buf, "acs_blacklist") == 0) {
+			/* these are not rates but the same function will do */
+			if (hostapd_parse_rates(&conf->acs_blacklist, pos)) {
+				wpa_printf(MSG_ERROR, "Line %d: invalid acs "
+					   "black list", line);
+				errors++;
+			}
+		} else if (os_strcmp(buf, "acs_whitelist") == 0) {
+			/* these are not rates but the same function will do */
+			if (hostapd_parse_rates(&conf->acs_whitelist, pos)) {
+				wpa_printf(MSG_ERROR, "Line %d: invalid acs "
+					   "white list", line);
+				errors++;
+			}
 		} else if (os_strcmp(buf, "preamble") == 0) {
 			if (atoi(pos))
 				conf->preamble = SHORT_PREAMBLE;

hostapd/hostapd.conf

@@ -105,8 +105,20 @@ hw_mode=g
 # (default: 0, i.e., not set)
 # Please note that some drivers do not use this value from hostapd and the
 # channel will need to be configured separately with iwconfig.
+# When set to 0, automatic channel selection will be engaged. A channel
+# will be selected from the desired hw_mode.
 channel=1
 
+# Automatic channel selection (ACS) whitelist
+# (default: not set)
+# Allow only these channels in automatic channel selection
+# acs_whitelist=1 2 3 4 5 6 7 8 9 10 11
+
+# Automatic channel selection (ACS) blacklist
+# (default: not set)
+# Don't allow these channels in automatic channel selection
+# acs_blacklist=1 2 3 4 5 6 7 8 9 10 11
+
 # Beacon interval in kus (1.024 ms) (default: 100; range 15..65535)
 beacon_int=100
 

src/ap/ap_config.h

@@ -454,6 +454,9 @@ struct hostapd_config {
 	u32 vht_capab;
 	int ieee80211ac;
 	u8 vht_oper_chwidth;
+
+	int *acs_blacklist;
+	int *acs_whitelist;
 };
 
 

src/ap/hostapd.c

@@ -852,7 +852,15 @@ static int setup_interface(struct hostapd_iface *iface)
 				   "channel. (%d)", ret);
 			return -1;
 		}
-		ret = hostapd_check_ht_capab(iface);
+		/* we don't need hostapd_check_ht_capab if the channel is
+		 * selected automatically */
+		if (ret == 1) {
+			wpa_printf(MSG_DEBUG, "Interface HW mode selection and "
+				   "initialization be completed in a callback");
+			return 0;
+		}
+
+		ret = hostapd_check_ht_capab(iface, NULL);
 		if (ret < 0)
 			return -1;
 		if (ret == 1) {