Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Received-SPF: Pass (esa1.microchip.iphmx.com: domain of
  Ajay.Kathat@microchip.com designates 198.175.253.82 as
  permitted sender) identity=mailfrom;
  client-ip=198.175.253.82; receiver=esa1.microchip.iphmx.com;
  envelope-from="Ajay.Kathat@microchip.com";
  x-sender="Ajay.Kathat@microchip.com"; x-conformance=spf_only;
  x-record-type="v=spf1"; x-record-text="v=spf1 mx
  a:ushub1.microchip.com a:smtpout.microchip.com
  -exists:%{i}.spf.microchip.iphmx.com include:servers.mcsv.net
  include:mktomail.com include:spf.protection.outlook.com ~all"
Received-SPF: None (esa1.microchip.iphmx.com: no sender
  authenticity information available from domain of
  postmaster@email.microchip.com) identity=helo;
  client-ip=198.175.253.82; receiver=esa1.microchip.iphmx.com;
  envelope-from="Ajay.Kathat@microchip.com";
  x-sender="postmaster@email.microchip.com";
  x-conformance=spf_only
IronPort-SDR: LQXZS7/Obq+QVkg9zWvwH+kA8pAr8lIVMFQGw7lpfNurWE0h0hYzd+97QTb3Ty1fkWgg/ECO8B
 XljA10uqFXdm+s3cS4pQmZKBT5XAKMaFV/KCb2RBIq1gJExPvbSukdx0PkqI6cqgp+zoGgXMmt
 8ML99SVui1z6qOhNEYb7adRYQiQrsAi8ZK9GzFTCbArf3GAAcsEDOy/KJctSeuU1STUgAzLR4k
 jEMchQI1WvI93FRqOO/ZSbvA6+abdZZCFyoz85lm/Z5G9vEYi6+0/smoyRjmuUophW0xZeCT2L
 79U=
From:   <Ajay.Kathat@microchip.com>
To:     <linux-wireless@vger.kernel.org>
CC:     <devel@driverdev.osuosl.org>, <gregkh@linuxfoundation.org>,
        <Adham.Abozaeid@microchip.com>, <johannes@sipsolutions.net>,
        <Ajay.Kathat@microchip.com>
Subject: [PATCH 1/3] staging: wilc1000: remove use of vendor specific IE for
 p2p handling
Thread-Topic: [PATCH 1/3] staging: wilc1000: remove use of vendor specific IE
 for p2p handling
Thread-Index: AQHV4EDvKZ+ZuIpTBEOwTMxTMpDjDQ==
Date:   Mon, 10 Feb 2020 18:35:58 +0000
Message-ID: <20200211000652.4781-1-ajay.kathat@microchip.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microchip.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: b014bafe-014a-4afb-f401-08d7ae581263
X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Feb 2020 18:35:58.3600
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: IFXcd7/ViZpoaUiPY6O2F7UJTa2/rRbDxvjB1IwrhURBMk6xD2D5bfuCn4/WM6mB/S5bnATC20OgTnRBXzoK9EYBWD8ltDtlCvjb1TgMIq0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1636
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

From: Ajay Singh <ajay.kathat@microchip.com>

Remove the use of vendor specific IE parameter to decide
p2p_GO/p2p_Client roles between two 'wilc' device. Previously p2p group
formation between two 'wilc' device make use of vendor IE for roles
decision. The role is decided based on the 'go_intent' value.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 drivers/staging/wilc1000/cfg80211.c | 72 ++---------------------------
 drivers/staging/wilc1000/netdev.c   |  2 -
 drivers/staging/wilc1000/netdev.h   |  7 ---
 3 files changed, 4 insertions(+), 77 deletions(-)

diff --git a/drivers/staging/wilc1000/cfg80211.c b/drivers/staging/wilc1000=
/cfg80211.c
index 4863e516ff13..7afbc475b3ea 100644
--- a/drivers/staging/wilc1000/cfg80211.c
+++ b/drivers/staging/wilc1000/cfg80211.c
@@ -68,7 +68,6 @@ struct wilc_p2p_mgmt_data {
 };
=20
 static const u8 p2p_oui[] =3D {0x50, 0x6f, 0x9A, 0x09};
-static const u8 p2p_vendor_spec[] =3D {0xdd, 0x05, 0x00, 0x08, 0x40, 0x03}=
;
=20
 static void cfg_scan_result(enum scan_event scan_event,
 			    struct wilc_rcvd_net_info *info, void *user_void)
@@ -172,9 +171,6 @@ static void cfg_connect_result(enum conn_event conn_dis=
conn_evt, u8 mac_status,
 	} else if (conn_disconn_evt =3D=3D CONN_DISCONN_EVENT_DISCONN_NOTIF) {
 		u16 reason =3D 0;
=20
-		priv->p2p.local_random =3D 0x01;
-		priv->p2p.recv_random =3D 0x00;
-		priv->p2p.is_wilc_ie =3D false;
 		eth_zero_addr(priv->associated_bss);
 		wilc_wlan_set_bssid(priv->dev, NULL, WILC_STATION_MODE);
=20
@@ -446,9 +442,6 @@ static int disconnect(struct wiphy *wiphy, struct net_d=
evice *dev,
 		wilc->sta_ch =3D WILC_INVALID_CHANNEL;
 	wilc_wlan_set_bssid(priv->dev, NULL, WILC_STATION_MODE);
=20
-	priv->p2p.local_random =3D 0x01;
-	priv->p2p.recv_random =3D 0x00;
-	priv->p2p.is_wilc_ie =3D false;
 	priv->hif_drv->p2p_timeout =3D 0;
=20
 	ret =3D wilc_disconnect(vif);
@@ -934,9 +927,6 @@ static void wilc_wfi_cfg_parse_rx_action(u8 *buf, u32 l=
en, u8 sta_ch)
 	u8 channel_list_attr_index =3D 0;
=20
 	while (index < len) {
-		if (buf[index] =3D=3D GO_INTENT_ATTR_ID)
-			buf[index + 3] =3D (buf[index + 3]  & 0x01) | (0x00 << 1);
-
 		if (buf[index] =3D=3D  CHANLIST_ATTR_ID)
 			channel_list_attr_index =3D index;
 		else if (buf[index] =3D=3D  OPERCHAN_ATTR_ID)
@@ -956,12 +946,6 @@ static void wilc_wfi_cfg_parse_tx_action(u8 *buf, u32 =
len, bool oper_ch,
 	u8 channel_list_attr_index =3D 0;
=20
 	while (index < len) {
-		if (buf[index] =3D=3D GO_INTENT_ATTR_ID) {
-			buf[index + 3] =3D (buf[index + 3]  & 0x01) | (0x0f << 1);
-
-			break;
-		}
-
 		if (buf[index] =3D=3D  CHANLIST_ATTR_ID)
 			channel_list_attr_index =3D index;
 		else if (buf[index] =3D=3D  OPERCHAN_ATTR_ID)
@@ -981,24 +965,6 @@ static void wilc_wfi_cfg_parse_rx_vendor_spec(struct w=
ilc_priv *priv, u8 *buff,
 	struct wilc_vif *vif =3D netdev_priv(priv->dev);
=20
 	subtype =3D buff[P2P_PUB_ACTION_SUBTYPE];
-	if ((subtype =3D=3D GO_NEG_REQ || subtype =3D=3D GO_NEG_RSP) &&
-	    !priv->p2p.is_wilc_ie) {
-		for (i =3D P2P_PUB_ACTION_SUBTYPE; i < size; i++) {
-			if (!memcmp(p2p_vendor_spec, &buff[i], 6)) {
-				priv->p2p.recv_random =3D buff[i + 6];
-				priv->p2p.is_wilc_ie =3D true;
-				break;
-			}
-		}
-	}
-
-	if (priv->p2p.local_random <=3D priv->p2p.recv_random) {
-		netdev_dbg(vif->ndev,
-			   "PEER WILL BE GO LocaRand=3D%02x RecvRand %02x\n",
-			   priv->p2p.local_random, priv->p2p.recv_random);
-		return;
-	}
-
 	if (subtype =3D=3D GO_NEG_REQ || subtype =3D=3D GO_NEG_RSP ||
 	    subtype =3D=3D P2P_INV_REQ || subtype =3D=3D P2P_INV_RSP) {
 		for (i =3D P2P_PUB_ACTION_SUBTYPE + 2; i < size; i++) {
@@ -1051,8 +1017,6 @@ void wilc_wfi_p2p_rx(struct wilc_vif *vif, u8 *buff, =
u32 size)
 		return;
 	}
 	if (buff[ACTION_CAT_ID] =3D=3D PUB_ACTION_ATTR_ID) {
-		u8 subtype =3D buff[P2P_PUB_ACTION_SUBTYPE];
-
 		switch (buff[ACTION_SUBTYPE_ID]) {
 		case GAS_INITIAL_REQ:
 		case GAS_INITIAL_RSP:
@@ -1063,10 +1027,6 @@ void wilc_wfi_p2p_rx(struct wilc_vif *vif, u8 *buff,=
 u32 size)
 				wilc_wfi_cfg_parse_rx_vendor_spec(priv, buff,
 								  size);
=20
-			if ((subtype =3D=3D GO_NEG_REQ || subtype =3D=3D GO_NEG_RSP) &&
-			    priv->p2p.is_wilc_ie)
-				size -=3D 7;
-
 			break;
=20
 		default:
@@ -1167,17 +1127,8 @@ static void wilc_wfi_cfg_tx_vendor_spec(struct wilc_=
priv *priv,
 	u8 subtype =3D buf[P2P_PUB_ACTION_SUBTYPE];
 	struct wilc_vif *vif =3D netdev_priv(priv->dev);
=20
-	if (subtype =3D=3D GO_NEG_REQ || subtype =3D=3D GO_NEG_RSP) {
-		if (priv->p2p.local_random =3D=3D 1 &&
-		    priv->p2p.recv_random < priv->p2p.local_random) {
-			get_random_bytes(&priv->p2p.local_random, 1);
-			priv->p2p.local_random++;
-		}
-	}
-
-	if (priv->p2p.local_random <=3D priv->p2p.recv_random ||
-	    !(subtype =3D=3D GO_NEG_REQ || subtype =3D=3D GO_NEG_RSP ||
-	      subtype =3D=3D P2P_INV_REQ || subtype =3D=3D P2P_INV_RSP))
+	if (subtype !=3D GO_NEG_REQ && subtype !=3D GO_NEG_RSP &&
+	    subtype !=3D P2P_INV_REQ && subtype !=3D P2P_INV_RSP)
 		return;
=20
 	for (i =3D P2P_PUB_ACTION_SUBTYPE + 2; i < len; i++) {
@@ -1196,15 +1147,6 @@ static void wilc_wfi_cfg_tx_vendor_spec(struct wilc_=
priv *priv,
 			break;
 		}
 	}
-
-	if (subtype !=3D P2P_INV_REQ && subtype !=3D P2P_INV_RSP) {
-		int vendor_spec_len =3D sizeof(p2p_vendor_spec);
-
-		memcpy(&mgmt_tx->buff[len], p2p_vendor_spec,
-		       vendor_spec_len);
-		mgmt_tx->buff[len + vendor_spec_len] =3D priv->p2p.local_random;
-		mgmt_tx->size =3D buf_len;
-	}
 }
=20
 static int mgmt_tx(struct wiphy *wiphy,
@@ -1221,8 +1163,6 @@ static int mgmt_tx(struct wiphy *wiphy,
 	struct wilc_vif *vif =3D netdev_priv(wdev->netdev);
 	struct wilc_priv *priv =3D &vif->priv;
 	struct host_if_drv *wfi_drv =3D priv->hif_drv;
-	u32 buf_len =3D len + sizeof(p2p_vendor_spec) +
-			sizeof(priv->p2p.local_random);
 	int ret =3D 0;
=20
 	*cookie =3D prandom_u32();
@@ -1238,7 +1178,7 @@ static int mgmt_tx(struct wiphy *wiphy,
 		goto out;
 	}
=20
-	mgmt_tx->buff =3D kmalloc(buf_len, GFP_KERNEL);
+	mgmt_tx->buff =3D kmalloc(len, GFP_KERNEL);
 	if (!mgmt_tx->buff) {
 		ret =3D -ENOMEM;
 		kfree(mgmt_tx);
@@ -1272,7 +1212,7 @@ static int mgmt_tx(struct wiphy *wiphy,
 			if (!memcmp(p2p_oui, &buf[ACTION_SUBTYPE_ID + 1], 4))
 				wilc_wfi_cfg_tx_vendor_spec(priv, mgmt_tx,
 							    params, vif->iftype,
-							    buf_len);
+							    len);
 			else
 				netdev_dbg(vif->ndev,
 					   "Not a P2P public action frame\n");
@@ -1400,10 +1340,6 @@ static int change_virtual_intf(struct wiphy *wiphy, =
struct net_device *dev,
 	struct wilc_vif *vif =3D netdev_priv(dev);
 	struct wilc_priv *priv =3D &vif->priv;
=20
-	priv->p2p.local_random =3D 0x01;
-	priv->p2p.recv_random =3D 0x00;
-	priv->p2p.is_wilc_ie =3D false;
-
 	switch (type) {
 	case NL80211_IFTYPE_STATION:
 		vif->connecting =3D false;
diff --git a/drivers/staging/wilc1000/netdev.c b/drivers/staging/wilc1000/n=
etdev.c
index fce5bf2d82fa..045f5cdfdca0 100644
--- a/drivers/staging/wilc1000/netdev.c
+++ b/drivers/staging/wilc1000/netdev.c
@@ -577,7 +577,6 @@ static int wilc_mac_open(struct net_device *ndev)
 {
 	struct wilc_vif *vif =3D netdev_priv(ndev);
 	struct wilc *wl =3D vif->wilc;
-	struct wilc_priv *priv =3D wdev_priv(vif->ndev->ieee80211_ptr);
 	unsigned char mac_add[ETH_ALEN] =3D {0};
 	int ret =3D 0;
=20
@@ -621,7 +620,6 @@ static int wilc_mac_open(struct net_device *ndev)
 				 vif->frame_reg[1].reg);
 	netif_wake_queue(ndev);
 	wl->open_ifcs++;
-	priv->p2p.local_random =3D 0x01;
 	vif->mac_opened =3D 1;
 	return 0;
 }
diff --git a/drivers/staging/wilc1000/netdev.h b/drivers/staging/wilc1000/n=
etdev.h
index d5f7a6037fbc..c475e78e3a69 100644
--- a/drivers/staging/wilc1000/netdev.h
+++ b/drivers/staging/wilc1000/netdev.h
@@ -66,12 +66,6 @@ struct wilc_wfi_p2p_listen_params {
 	u64 listen_cookie;
 };
=20
-struct wilc_p2p_var {
-	u8 local_random;
-	u8 recv_random;
-	bool is_wilc_ie;
-};
-
 static const u32 wilc_cipher_suites[] =3D {
 	WLAN_CIPHER_SUITE_WEP40,
 	WLAN_CIPHER_SUITE_WEP104,
@@ -155,7 +149,6 @@ struct wilc_priv {
 	struct mutex scan_req_lock;
 	bool p2p_listen_state;
 	int scanned_cnt;
-	struct wilc_p2p_var p2p;
=20
 	u64 inc_roc_cookie;
 };
--=20
2.24.0