commit d596b510eaa48eba8736fa4e4ac5feb7650995c0
author Alexei Avshalom Lazar <ailizaro@codeaurora.org> Tue Dec 18 16:00:59 2018 +0200
committer Jouni Malinen <jouni@codeaurora.org> Tue Jan 29 23:39:26 2019 +0200
tree 4fef827a37dbed26a623b049bb54942a8edd887b
parent b094bf0811352a40f16a4187bbe8e7ec3de7b1df

Add support for 60G PBSS network mode

Signed-off-by: Alexei Avshalom Lazar <ailizaro@codeaurora.org>

sta.c

diff --git a/sta.c b/sta.c
index bf42f72..b1dccbb 100644
--- a/sta.c
+++ b/sta.c
@@ -1548,6 +1548,7 @@
 	const char *intf = get_param(cmd, "Interface");
 	const char *type = get_param(cmd, "Type");
 	const char *pmf = get_param(cmd, "PMF");
+	const char *network_mode = get_param(cmd, "network_mode");
 	const char *ifname, *val, *alg;
 	int id;
 
@@ -1656,6 +1657,11 @@
 		dut->sae_commit_override = strdup(val);
 	}
 
+	if (dut->program == PROGRAM_60GHZ && network_mode &&
+	    strcasecmp(network_mode, "PBSS") == 0 &&
+	    set_network(ifname, id, "pbss", "1") < 0)
+		return -2;
+
 	return 1;
 }
 
@@ -2166,6 +2172,7 @@
 			struct sigma_cmd *cmd)
 {
 	const char *intf = get_param(cmd, "Interface");
+	const char *network_mode = get_param(cmd, "network_mode");
 	const char *ifname;
 	int id;
 
@@ -2181,6 +2188,11 @@
 	if (set_network(ifname, id, "key_mgmt", "NONE") < 0)
 		return -2;
 
+	if (dut->program == PROGRAM_60GHZ && network_mode &&
+	    strcasecmp(network_mode, "PBSS") == 0 &&
+	    set_network(ifname, id, "pbss", "1") < 0)
+		return -2;
+
 	return 1;
 }
 
@@ -2656,6 +2668,7 @@
 	const char *wps_param = get_param(cmd, "WPS");
 	const char *bssid = get_param(cmd, "bssid");
 	const char *chan = get_param(cmd, "channel");
+	const char *network_mode = get_param(cmd, "network_mode");
 	int wps = 0;
 	char buf[1000], extra[50];
 
@@ -2697,6 +2710,12 @@
 		wps = 1;
 
 	if (wps) {
+		if (dut->program == PROGRAM_60GHZ && network_mode &&
+		    strcasecmp(network_mode, "PBSS") == 0 &&
+		    set_network(get_station_ifname(), dut->infra_network_id,
+				"pbss", "1") < 0)
+			return -2;
+
 		if (dut->wps_method == WFA_CS_WPS_NOT_READY) {
 			send_resp(dut, conn, SIGMA_ERROR, "ErrorCode,WPS "
 				  "parameters not yet set");
@@ -5055,6 +5074,9 @@
 		return SIGMA_DUT_ERROR_CALLER_SEND_STATUS;
 	}
 
+	if (set_network(ifname, net_id, "pbss", "1") < 0)
+		return -2;
+
 	sigma_dut_print(dut, DUT_MSG_DEBUG,
 			"Supplicant set network with mode 2. network_id %d",
 			net_id);
@@ -11711,6 +11733,7 @@
 {
 	struct wpa_ctrl *ctrl;
 	const char *intf = get_param(cmd, "Interface");
+	const char *network_mode = get_param(cmd, "network_mode");
 	const char *role, *method;
 	int res;
 	char buf[256];
@@ -11721,11 +11744,20 @@
 		"WPS-FAIL",
 		NULL
 	};
+	int id = 0;
 
 	/* 60G WPS tests do not pass Interface parameter */
 	if (!intf)
 		intf = get_main_ifname();
 
+	if (dut->band == WPS_BAND_60G && network_mode &&
+	    strcasecmp(network_mode, "PBSS") == 0) {
+		sigma_dut_print(dut, DUT_MSG_DEBUG,
+				"Set PBSS network mode, network id %d", id);
+		if (set_network(get_station_ifname(), id, "pbss", "1") < 0)
+			return -2;
+	}
+
 	if (dut->force_rsn_ie) {
 		sigma_dut_print(dut, DUT_MSG_DEBUG, "Force RSN_IE: %d",
 				dut->force_rsn_ie);