Commit 44288f11 authored Oct 11, 2019 by Jérôme Pouiller Committed by Greg Kroah-Hartman Oct 14, 2019

staging: wfx: fix error handling in wfx_tx_get_raw_link_id()



Since wfx_tx_get_raw_link_id() return an unsigned, it makes no sense to
return a negative value. "15" is a better value since it is used by
firmware for stations that have not yet associated link-ids.

Note that this should never happens since driver set max_ap_assoc_sta
to 14.

Fixes: 9bca45f3 ("staging: wfx: allow to send 802.11 frames")
Reported-by: kbuild test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20191011101639.31025-1-Jerome.Pouiller@silabs.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 80741191

drivers/staging/wfx/data_tx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		#include "hif_tx_mib.h"

		#define WFX_INVALID_RATE_ID (0xFF)
		#define WFX_LINK_ID_NO_ASSOC 15
		#define WFX_LINK_ID_GC_TIMEOUT ((unsigned long)(10 * HZ))

		static int wfx_get_hw_rate(struct wfx_dev wdev, const struct ieee80211_tx_rate rate)
		@@ -480,7 +481,7 @@ static uint8_t wfx_tx_get_raw_link_id(struct wfx_vif *wvif, struct ieee80211_sta
		ret = wfx_alloc_link_id(wvif, da);
		if (!ret) {
		dev_err(wvif->wdev->dev, "no more link-id available\n");
		return -ENOENT;
		return WFX_LINK_ID_NO_ASSOC;
		}
		return ret;
		}

Admin message