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:   <Ajay.Kathat@microchip.com>
To:     <linux-wireless@vger.kernel.org>
CC:     <Claudiu.Beznea@microchip.com>, <Sripad.Balwadgi@microchip.com>,
        <Ajay.Kathat@microchip.com>
Subject: [PATCH 6/8] wifi: wilc1000: cancel the connect operation during
 interface down
Thread-Topic: [PATCH 6/8] wifi: wilc1000: cancel the connect operation during
 interface down
Thread-Index: AQHYnFIyKXBWLfJKwUmhG/brPRejYQ==
Date:   Wed, 20 Jul 2022 16:03:05 +0000
Message-ID: <20220720160302.231516-6-ajay.kathat@microchip.com>
References: <20220720160302.231516-1-ajay.kathat@microchip.com>
In-Reply-To: <20220720160302.231516-1-ajay.kathat@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?slYrI1Y28Snj4QR8wMO38rZjUqo/qockoNJg5pHYMZH9t9qVxp5qitW1n4?=
 =?iso-8859-1?Q?JRQXN/IeBmcVwFFTxZvxUScv1fwBLO7GV+Kx9sZ8SzCtuXdNO1AXGdVnAW?=
 =?iso-8859-1?Q?cdVwdm6kqf1Eu87Q1LYyI959mNOoJASxQqQafDvctdzawtG3jEoINJVOFs?=
 =?iso-8859-1?Q?9Iiqlq2betBfTOjpMdNRDoFHWHzE13Z2Jx0q6FN1pgI7SzGraBHNkk3Xf4?=
 =?iso-8859-1?Q?zQkzX7eal6GucC3tQdDiS5XhNwyhWi4+XCIg5+wEtOVIgYlUvmhSNuw9aj?=
 =?iso-8859-1?Q?jkCBLKJg8yQ1Q/Lj6zQNbg+htUPGUTQ9bPQea36VZ/lTuIQFNaL0k7TbRa?=
 =?iso-8859-1?Q?9kyaS1zCIGGyNHUzib6xHiccluhGw0i7nG6eQYljReodsciyFK3zbfbKKK?=
 =?iso-8859-1?Q?PoOtLBxU5rJwCLxf9CsC/R09GF/YsHZF3QUmypInobmL1KTPomsXtGLXUz?=
 =?iso-8859-1?Q?a64ipEQvFkx4DENMkc/dEAr6UBZdXm9ksNeVnTUHkKwb3+ab8BPMTpsATa?=
 =?iso-8859-1?Q?wr09USxmUJRHTiJzSTNCT0lwRvriadY7iQXEH8oxM3PL3xEYMPYNhLAa8c?=
 =?iso-8859-1?Q?9icM7B9RaAiEmBRPLaVvWnjQNKb15V5Qb/S35OCJSwdjwvwoyle+nKE1nl?=
 =?iso-8859-1?Q?CwfqQzSw36+FJqbyoll4Wiv485YoKWKunya+Djt9KL34JBt/GsXobwh82z?=
 =?iso-8859-1?Q?+2oLqSpUiNJZFTxQB4MoIWIZIQmROO8HVWJ24PwzUKBNwzTsTDHJqF4aBc?=
 =?iso-8859-1?Q?gMFMdeY6sjkE90aZ/Pr69ytw/aehaXEqbpRC+d7b1+8GwXnWbDScGBuZML?=
 =?iso-8859-1?Q?zPo/R3AsXLglEorIY6wScqBKWnqBcnvP8FI1czWP3z1omS3fylQQlu/IIq?=
 =?iso-8859-1?Q?8PzaXHGyFYEf0zCe4Yd3JzvvbF6lFFHiKuwxFoxciTOi7K5jFlN+DejIhh?=
 =?iso-8859-1?Q?oBV2GSJmOsonGBN/AJzWnSMD/shvRe4frEfK37oXMTVesNH5HA+jeAcBQ0?=
 =?iso-8859-1?Q?/1jW4RBdWA5zmSwkYULBz8ZLoccI61o6n8mGfe+bTqa77GJchy4C8uS7mB?=
 =?iso-8859-1?Q?K0na8VfNbhAVy3hg8aYbCFuwhKL2lXNUybBUa1O08iqnpex+kcczP+O6i2?=
 =?iso-8859-1?Q?50CtZEbqP//jlu4anYxKSK00bDmEYmF/J3I9VDTDnRd1vuhHJTroyN3R3w?=
 =?iso-8859-1?Q?jBFimEBqm4KLK5QU9KtsC9ghaCW30m4MbvlxTp3Psf4Po9DRQlDdNTOgRS?=
 =?iso-8859-1?Q?Z9Ntk7NkR3p+X0FG/MmsrDn9oVsMF8kgaGa0Qpo0fU9Se0noLlttwY58zN?=
 =?iso-8859-1?Q?dofr8gAqTXlZokzhnLq1qTDk+LkEOTthZNxzYh2LqKqokWEwSU8iDngHId?=
 =?iso-8859-1?Q?tuogI+5UuV43/hjh9gJNrD57wwC7ajNedGjpMg0yKLM8u5gPrWJir3DU6H?=
 =?iso-8859-1?Q?CFdg6iPhHCmcp8h8VGqRYmvMjmtGX6Hi0rFUVGde6Q8YihtzQkkbR+xDjN?=
 =?iso-8859-1?Q?wllY/uCvCc4WqHIfut8vzwIkFbj4pqpnGCYvaXWtxPl8EfHtC5dj9/iccS?=
 =?iso-8859-1?Q?oEIc/UlK8sRW2VraM5ESFO2MFAx8z/zC37YaWz6SxpSZMJPvWWGGY6U1rC?=
 =?iso-8859-1?Q?T2jvtXD+Fgqy4nKC6gAG2SbhWfM+WWswC4L8q5XRoi2PFP9gAgBy4Dj7u/?=
 =?iso-8859-1?Q?jNgprtyw12LCaiQUhMM=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: PH0PR11MB5176.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 747d0cee-905b-43b0-902c-08da6a695562
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jul 2022 16:03:05.3582
 (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: OhcjZAQoXnFwbyELOjXxAhxSX39cDY6YaAT1Opx7PitY83edn+s/51+NtVlHZ+hbZAJ/VFiH+oVXpsX7pFwibNait/vMaZ0xYh9VQVxLOqo=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4174
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,
        SPF_PASS autolearn=ham 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

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

Cancel the ongoing connection request to avoid any issue if the
interface is set down before the connection request is completed.
host_int_handle_disconnect was already available, so renamed it and used
the same API for 'ndio_close' cb.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 drivers/net/wireless/microchip/wilc1000/hif.c    | 6 ++----
 drivers/net/wireless/microchip/wilc1000/hif.h    | 1 +
 drivers/net/wireless/microchip/wilc1000/netdev.c | 1 +
 3 files 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 021e0db80bd2..b89519ab9205 100644
--- a/drivers/net/wireless/microchip/wilc1000/hif.c
+++ b/drivers/net/wireless/microchip/wilc1000/hif.c
@@ -635,7 +635,7 @@ static inline void host_int_parse_assoc_resp_info(struc=
t wilc_vif *vif,
 	conn_info->req_ies_len =3D 0;
 }
=20
-static inline void host_int_handle_disconnect(struct wilc_vif *vif)
+inline void wilc_handle_disconnect(struct wilc_vif *vif)
 {
 	struct host_if_drv *hif_drv =3D vif->hif_drv;
=20
@@ -647,8 +647,6 @@ static inline void host_int_handle_disconnect(struct wi=
lc_vif *vif)
 	if (hif_drv->conn_info.conn_result)
 		hif_drv->conn_info.conn_result(CONN_DISCONN_EVENT_DISCONN_NOTIF,
 					       0, hif_drv->conn_info.arg);
-	else
-		netdev_err(vif->ndev, "%s: conn_result is NULL\n", __func__);
=20
 	eth_zero_addr(hif_drv->assoc_bssid);
=20
@@ -684,7 +682,7 @@ static void handle_rcvd_gnrl_async_info(struct work_str=
uct *work)
 		host_int_parse_assoc_resp_info(vif, mac_info->status);
 	} else if (mac_info->status =3D=3D WILC_MAC_STATUS_DISCONNECTED) {
 		if (hif_drv->hif_state =3D=3D HOST_IF_CONNECTED) {
-			host_int_handle_disconnect(vif);
+			wilc_handle_disconnect(vif);
 		} else if (hif_drv->usr_scan_req.scan_result) {
 			del_timer(&hif_drv->scan_timer);
 			handle_scan_done(vif, SCAN_EVENT_ABORTED);
diff --git a/drivers/net/wireless/microchip/wilc1000/hif.h b/drivers/net/wi=
reless/microchip/wilc1000/hif.h
index d8dd94dcfe14..69ba1d469e9f 100644
--- a/drivers/net/wireless/microchip/wilc1000/hif.h
+++ b/drivers/net/wireless/microchip/wilc1000/hif.h
@@ -215,4 +215,5 @@ void wilc_gnrl_async_info_received(struct wilc *wilc, u=
8 *buffer, u32 length);
 void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,
 				struct cfg80211_crypto_settings *crypto);
 int wilc_set_default_mgmt_key_index(struct wilc_vif *vif, u8 index);
+inline void wilc_handle_disconnect(struct wilc_vif *vif);
 #endif
diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net=
/wireless/microchip/wilc1000/netdev.c
index 7879446f282f..2de5838a4426 100644
--- a/drivers/net/wireless/microchip/wilc1000/netdev.c
+++ b/drivers/net/wireless/microchip/wilc1000/netdev.c
@@ -780,6 +780,7 @@ static int wilc_mac_close(struct net_device *ndev)
 	if (vif->ndev) {
 		netif_stop_queue(vif->ndev);
=20
+		wilc_handle_disconnect(vif);
 		wilc_deinit_host_int(vif->ndev);
 	}
=20
--=20
2.34.1