Merge "wil6210: fix return code of wmi_mgmt_tx and wmi_mgmt_tx_ext" (bcd29396) · Commits · e / devices / android_kernel_xiaomi_nabu

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

+6 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2017 Qualcomm Atheros, Inc.
		* Copyright (c) 2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
		*
		* Permission to use, copy, modify, and/or distribute this software for any
		* purpose with or without fee is hereby granted, provided that the above
		@@ -1567,7 +1567,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);

+7 −6

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2017 Qualcomm Atheros, Inc.
		* Copyright (c) 2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
		*
		* Permission to use, copy, modify, and/or distribute this software for any
		* purpose with or without fee is hereby granted, provided that the above
		@@ -3685,8 +3685,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);
		@@ -3738,9 +3739,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);