Commit 365fdf7e authored Apr 01, 2020 by Jérôme Pouiller Committed by Greg Kroah-Hartman Apr 13, 2020

staging: wfx: uniformize queue_id retrieval

tx_info->hw_queue contains "vif.hw_queue[skb_get_queue_mapping(skb)]".
For now, it is equivalent of "skb_get_queue_mapping(skb)". However, it
is not the same semantic. In wfx_tx_inner(), we want to get the mac80211
queue index, not the hardware queue index.

Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200401110405.80282-6-Jerome.Pouiller@silabs.com

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

parent 57c52220

drivers/staging/wfx/data_tx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -417,7 +417,7 @@ static int wfx_tx_inner(struct wfx_vif wvif, struct ieee80211_sta sta,
		struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
		struct ieee80211_key_conf *hw_key = tx_info->control.hw_key;
		struct ieee80211_hdr hdr = (struct ieee80211_hdr )skb->data;
		int queue_id = tx_info->hw_queue;
		int queue_id = skb_get_queue_mapping(skb);
		size_t offset = (size_t)skb->data & 3;
		int wmsg_len = sizeof(struct hif_msg) +
		sizeof(struct hif_req_tx) + offset;