mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-14 05:22:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: wfx: do not rely anymore on link_id to choose packet in queue

Browse Source 
link_id was expected to contain identifier of a station. It was also
used to mark frames that has to sent after dtim. We do not use the
further purpose. For the last purpose, we can directly check the flag
value in tx_info.

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-17-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jérôme Pouiller
2020-04-01 13:03:49 +02:00
committed by Greg Kroah-Hartman
parent 9e76ba7744
commit 9251ad667d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/wfx/queue.c
View File

@@ -158,16 +158,17 @@ void wfx_tx_queue_put(struct wfx_dev *wdev, struct wfx_queue *queue,
static struct sk_buff *wfx_tx_queue_get(struct wfx_dev *wdev,
struct wfx_queue *queue,
u32 link_id_map)
bool mcast)
{
struct wfx_queue_stats *stats = &wdev->tx_queue_stats;
struct ieee80211_tx_info *tx_info;
struct sk_buff *item, *skb = NULL;
struct wfx_tx_priv *tx_priv;
spin_lock_bh(&queue->queue.lock);
skb_queue_walk(&queue->queue, item) {
tx_priv = wfx_skb_tx_priv(item);
if (link_id_map & BIT(tx_priv->link_id)) {
tx_info = IEEE80211_SKB_CB(item);
if (mcast == !!(tx_info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM)) {
skb = item;
break;
}
@@ -381,7 +382,7 @@ struct hif_msg *wfx_tx_queues_get(struct wfx_dev *wdev)
for (i = 0; i < IEEE80211_NUM_ACS; ++i) {
skb = wfx_tx_queue_get(wvif->wdev,
&wdev->tx_queue[i],
BIT(WFX_LINK_ID_AFTER_DTIM));
true);
if (skb) {
hif = (struct hif_msg *)skb->data;
// Cannot happen since only one vif can
@@ -416,7 +417,7 @@ struct hif_msg *wfx_tx_queues_get(struct wfx_dev *wdev)
queue_num = queue - wdev->tx_queue;
skb = wfx_tx_queue_get(wdev, queue, ~BIT(WFX_LINK_ID_AFTER_DTIM));
skb = wfx_tx_queue_get(wdev, queue, false);
if (!skb)
continue;