Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   <Amisha.Patel@microchip.com>
To:     <linux-wireless@vger.kernel.org>
CC:     <Ajay.Kathat@microchip.com>, <Claudiu.Beznea@microchip.com>,
        <Amisha.Patel@microchip.com>
Subject: [PATCH] wifi: wilc1000: fix for absent RSN capabilities WFA testcase
Thread-Topic: [PATCH] wifi: wilc1000: fix for absent RSN capabilities WFA
 testcase
Thread-Index: AQHZZ+VFaoRux7AH/kad9DveyKpmhA==
Date:   Wed, 5 Apr 2023 17:37:18 +0000
Message-ID: <20230405173555.6041-1-amisha.patel@microchip.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?KszqwVKqLvytEjlbxdo+tc2cp/j1MzrNzBckQfS2Phbbr+Cmc2cBAOnlDY?=
 =?iso-8859-1?Q?tkhvg2ZefLiSy8snpf1+ivl1jTs5ariWytzWXfxg6obD2NRfM2W3ZFNTy6?=
 =?iso-8859-1?Q?24KUIopdyGpKp7ayb+XD9O9QgpsG8fDV5WBZXo+dmTfdfyUY7Uii+Uy3kb?=
 =?iso-8859-1?Q?SqO6srxLncAremQxwph/qT7N3GN05h56itQ51nEiRckX5ER2Wr6ucBc5DX?=
 =?iso-8859-1?Q?TeYIQH3lIgzf+TWeuhe7GbA83oR31IHbgqSVBigEVvxoMfH4mpcuv2RM6x?=
 =?iso-8859-1?Q?Dg3XDdfAsEgv/9X9ug+u9GdN2by1Hw6A+BotoOKCGZUaCA4RMkEewO+ann?=
 =?iso-8859-1?Q?KO9ReemPIYD/1rb43XDDW0fBGa44V98oW9a642DJsbc0AFCPXV713WY47j?=
 =?iso-8859-1?Q?laxweLrahRlWurc9xzsgg1GMVoh6z9VMMBr3wN9zlRqIwBCP8+pbr6MDZc?=
 =?iso-8859-1?Q?+PfX8vGlaA0Z45HUiny/a0uzZOtZXCAnJvmxiqLVlG3og+6VzCazlBd/jt?=
 =?iso-8859-1?Q?lISpK25bjjxYPXYj+/mbxmFO/AYeqIFb3IhC0/DhjxPrXQtnestfgLzFu5?=
 =?iso-8859-1?Q?AkgRPNUhXFUhu+UwxClY004BFZ3+9tHN0lzdwqOR6Gtb0NdL/lGfAOPPNA?=
 =?iso-8859-1?Q?2LA0TLvUIPKWEGlcVMXOznT9E5YKg62rwE96w346Xom7JiFQyfK4Hy7V67?=
 =?iso-8859-1?Q?i1EQ2pVY5NeU2Y2hALeDyUOuUMSZVk78v0lb+HS+ZVKGws60uQwIsiKeTD?=
 =?iso-8859-1?Q?6ILfvudxiGvExaBbWtEl70c2baO/T7Z8stwDaEM0SJRDKZvJgGBitHkUjI?=
 =?iso-8859-1?Q?xCDtYCQoTIN6g7/gdCyrF73aE9tkfoO7SpwUwln1TlGfgCp7b6wjxJKw9e?=
 =?iso-8859-1?Q?fGrdHoz7vgPaPN76Xhf9R5owbE66LYSEi+WLPZ5VdvFOHyeGK5a8ifsR2M?=
 =?iso-8859-1?Q?a5H/8jOPAqHxP6asVwGJlN8QwCU9TnUubA8AwilAUBgtr/rhO6RIT7U20p?=
 =?iso-8859-1?Q?I8NgAthcRZmGssRYNxboAgrBDiPJJZaE8vMa73yNPRxLLMv8ihqy5T91V4?=
 =?iso-8859-1?Q?XDqTVSnezh3YfRAz2TQCmSrITtv0QwXdvTF6uaYxnToHG6m6Vh6HJJcozc?=
 =?iso-8859-1?Q?lNdwTLA/CKaV/+BhWoSai+bZ1Ok6m/0aZWGXdHIDdl0M+Dp8mcakPhC26X?=
 =?iso-8859-1?Q?do4B0F8AKi6NASd8C2chojfE0/f4M2MrGmU72UoZHVL7fic3M1P7pA3WpR?=
 =?iso-8859-1?Q?3jspVSllpj8YRwO6KPDyvLKYRp5eJzb0lHYmZEG9dpaxYDyWKEKU01229O?=
 =?iso-8859-1?Q?u1Pw1LQsOirsk+Ptd1JnKI0IpMjBFjicoDL+PkuW8yaA4MVe1pi8N2rhSJ?=
 =?iso-8859-1?Q?0F2mNCQmtsm3142rfH4rq7QJ9ZPicDFnMAAY8GpLsAWdOEtwlvKQlNHEuX?=
 =?iso-8859-1?Q?ByiC+DPxMfh+QEuXYXhSAelJSzuHAAoB3ZQsioQWU4aoGgPM1fdayubbcv?=
 =?iso-8859-1?Q?EXaUvcSOEvHYgoWvjWW2LEn3VBzi5ZCtUiAsKeEU3NmMszsI7Wz0hIN+mS?=
 =?iso-8859-1?Q?nF245k1lsR2vQoreoK0z5sBMnau1njkTwEIDWBTnbrMeOUfHPUrCmkhjFB?=
 =?iso-8859-1?Q?V+xknGNZfqc+5v+XqKWjl7O90YwZKtssXpomHvo/4jbIVoAJjvlpnX9w?=
 =?iso-8859-1?Q?=3D=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: CY8PR11MB7393.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2e627c10-5046-4e0f-1b6e-08db35fc6790
X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Apr 2023 17:37:18.8151
 (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: BWynWpASaBAx7UqrqARTdDiYGuNhtmFkDqs/7k0FvdOeRE/i4bBi1zCsXIBuzYBp/U7wv3urIYM9Z2e3GtrvYND2xb7oox74V7vIqD+HeGU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB6562
X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS autolearn=unavailable autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

Enable the RSN flag to pass cipher suite and AMK information, even when
RSN capabilities field not present (as it's optional).

Fixes: cd21d99e595e ("wifi: wilc1000: validate pairwise and authentication =
suite offsets")
Signed-off-by: Amisha Patel <amisha.patel@microchip.com>
---
 drivers/net/wireless/microchip/wilc1000/hif.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/hif.c b/drivers/net/wi=
reless/microchip/wilc1000/hif.c
index 5adc69d5bcae..a28da5938481 100644
--- a/drivers/net/wireless/microchip/wilc1000/hif.c
+++ b/drivers/net/wireless/microchip/wilc1000/hif.c
@@ -485,6 +485,9 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bs=
s,
 		int rsn_ie_len =3D sizeof(struct element) + rsn_ie[1];
 		int offset =3D 8;
=20
+		param->mode_802_11i =3D 2;
+		param->rsn_found =3D true;
+
 		/* extract RSN capabilities */
 		if (offset < rsn_ie_len) {
 			/* skip over pairwise suites */
@@ -494,11 +497,8 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *b=
ss,
 				/* skip over authentication suites */
 				offset +=3D (rsn_ie[offset] * 4) + 2;
=20
-				if (offset + 1 < rsn_ie_len) {
-					param->mode_802_11i =3D 2;
-					param->rsn_found =3D true;
+				if (offset + 1 < rsn_ie_len)
 					memcpy(param->rsn_cap, &rsn_ie[offset], 2);
-				}
 			}
 		}
 	}
--=20
2.25.1