Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9861bf3b authored by Lior David's avatar Lior David Committed by Kalle Valo
Browse files

wil6210: fix call to wil6210_disconnect during unload 



Move the call to wil6210_disconnect so it will be called
before unregister_netdevice. This is because it calls
netif_carrier_off which is forbidden to call on an
unregistered net device. Calling netif_carrier_off can
add a link watch event which might be handled after
net device was freed, causing a kernel oops.

Signed-off-by: default avatarLior David <liord@codeaurora.org>
Signed-off-by: default avatarMaya Erez <merez@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 8a4fa214

drivers/net/wireless/ath/wil6210/netdev.c

+4 −4
Original line number Diff line number Diff line
@@ -457,16 +457,16 @@ void wil_vif_remove(struct wil6210_priv *wil, u8 mid) 
		return;

	}



	mutex_lock(&wil->mutex);

	wil6210_disconnect(vif, NULL, WLAN_REASON_DEAUTH_LEAVING, false);

	mutex_unlock(&wil->mutex);



	ndev = vif_to_ndev(vif);

	/* during unregister_netdevice cfg80211_leave may perform operations

	 * such as stop AP, disconnect, so we only clear the VIF afterwards

	 */

	unregister_netdevice(ndev);



	mutex_lock(&wil->mutex);

	wil6210_disconnect(vif, NULL, WLAN_REASON_DEAUTH_LEAVING, false);

	mutex_unlock(&wil->mutex);



	if (any_active && vif->mid != 0)

		wmi_port_delete(wil, vif->mid);