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

Commit cc603308 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wil6210: correctly report locally generated disconnect in STA mode" into msm-4.9

parents 6959573f 0a4e9d14

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

+1 −0
Original line number Diff line number Diff line
@@ -794,6 +794,7 @@ static int wil_cfg80211_disconnect(struct wiphy *wiphy, 
		return 0;

	}



	wil->locally_generated_disc = true;

	rc = wmi_call(wil, WMI_DISCONNECT_CMDID, NULL, 0,

		      WMI_DISCONNECT_EVENTID, NULL, 0,

		      WIL6210_DISCONNECT_TO_MS);

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

+4 −1
Original line number Diff line number Diff line
@@ -262,7 +262,10 @@ static void _wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid, 
		if (test_bit(wil_status_fwconnected, wil->status)) {

			clear_bit(wil_status_fwconnected, wil->status);

			cfg80211_disconnected(ndev, reason_code,

					      NULL, 0, false, GFP_KERNEL);

					      NULL, 0,

					      wil->locally_generated_disc,

					      GFP_KERNEL);

			wil->locally_generated_disc = false;

		} else if (test_bit(wil_status_fwconnecting, wil->status)) {

			cfg80211_connect_result(ndev, bssid, NULL, 0, NULL, 0,

						WLAN_STATUS_UNSPECIFIED_FAILURE,

drivers/net/wireless/ath/wil6210/wil6210.h

+1 −0
Original line number Diff line number Diff line
@@ -619,6 +619,7 @@ struct wil6210_priv { 
	int sinfo_gen;

	u32 ap_isolate; /* no intra-BSS communication */

	struct cfg80211_bss *bss; /* connected bss, relevant in STA mode */

	int locally_generated_disc; /* relevant in STA mode */

	/* interrupt moderation */

	u32 tx_max_burst_duration;

	u32 tx_interframe_timeout;

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

+1 −0
Original line number Diff line number Diff line
@@ -1529,6 +1529,7 @@ int wmi_disconnect_sta(struct wil6210_priv *wil, const u8 *mac, 


	wil_dbg_wmi(wil, "disconnect_sta: (%pM, reason %d)\n", mac, reason);



	wil->locally_generated_disc = true;

	if (del_sta) {

		ether_addr_copy(del_sta_cmd.dst_mac, mac);

		rc = wmi_call(wil, WMI_DEL_STA_CMDID, &del_sta_cmd,