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

Commit da30c277 authored by Lior David's avatar Lior David Committed by Greg Kroah-Hartman
Browse files

wil6210: fix return code of wmi_mgmt_tx and wmi_mgmt_tx_ext 



[ Upstream commit 49122ec42634f73babb1dc96f170023e5228d080 ]

The functions that send management TX frame have 3 possible
results: success and other side acknowledged receive (ACK=1),
success and other side did not acknowledge receive(ACK=0) and
failure to send the frame. The current implementation
incorrectly reports the ACK=0 case as failure.

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>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e667aef5

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

+5 −0
Original line number Diff line number Diff line
@@ -1131,7 +1131,12 @@ int wil_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, 
			     params->wait);



out:

	/* when the sent packet was not acked by receiver(ACK=0), rc will

	 * be -EAGAIN. In this case this function needs to return success,

	 * the ACK=0 will be reflected in tx_status.

	 */

	tx_status = (rc == 0);

	rc = (rc == -EAGAIN) ? 0 : rc;

	cfg80211_mgmt_tx_status(wdev, cookie ? *cookie : 0, buf, len,

				tx_status, GFP_KERNEL);

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

+6 −5
Original line number Diff line number Diff line
@@ -3107,8 +3107,9 @@ int wmi_mgmt_tx(struct wil6210_vif *vif, const u8 *buf, size_t len) 
	rc = wmi_call(wil, WMI_SW_TX_REQ_CMDID, vif->mid, cmd, total,

		      WMI_SW_TX_COMPLETE_EVENTID, &evt, sizeof(evt), 2000);

	if (!rc && evt.evt.status != WMI_FW_STATUS_SUCCESS) {

		wil_err(wil, "mgmt_tx failed with status %d\n", evt.evt.status);

		rc = -EINVAL;

		wil_dbg_wmi(wil, "mgmt_tx failed with status %d\n",

			    evt.evt.status);

		rc = -EAGAIN;

	}



	kfree(cmd);
@@ -3160,9 +3161,9 @@ int wmi_mgmt_tx_ext(struct wil6210_vif *vif, const u8 *buf, size_t len, 
	rc = wmi_call(wil, WMI_SW_TX_REQ_EXT_CMDID, vif->mid, cmd, total,

		      WMI_SW_TX_COMPLETE_EVENTID, &evt, sizeof(evt), 2000);

	if (!rc && evt.evt.status != WMI_FW_STATUS_SUCCESS) {

		wil_err(wil, "mgmt_tx_ext failed with status %d\n",

		wil_dbg_wmi(wil, "mgmt_tx_ext failed with status %d\n",

			    evt.evt.status);

		rc = -EINVAL;

		rc = -EAGAIN;

	}



	kfree(cmd);