Commit abaef537 authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Greg Kroah-Hartman

staging: wfx: drop unused argument in wfx_get_prio_queue()

The argument "total" is not used anymore since commit a3c529a8
("staging: wfx: simplify handling of IEEE80211_TX_CTL_SEND_AFTER_DTIM").

Fixes: a3c529a8 ("staging: wfx: simplify handling of IEEE80211_TX_CTL_SEND_AFTER_DTIM")
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200401110405.80282-11-Jerome.Pouiller@silabs.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f42483f9
...@@ -354,8 +354,7 @@ static bool wfx_handle_tx_data(struct wfx_dev *wdev, struct sk_buff *skb) ...@@ -354,8 +354,7 @@ static bool wfx_handle_tx_data(struct wfx_dev *wdev, struct sk_buff *skb)
} }
} }
static int wfx_get_prio_queue(struct wfx_vif *wvif, static int wfx_get_prio_queue(struct wfx_vif *wvif, u32 tx_allowed_mask)
u32 tx_allowed_mask, int *total)
{ {
const struct ieee80211_tx_queue_params *edca; const struct ieee80211_tx_queue_params *edca;
unsigned int score, best = -1; unsigned int score, best = -1;
...@@ -371,7 +370,6 @@ static int wfx_get_prio_queue(struct wfx_vif *wvif, ...@@ -371,7 +370,6 @@ static int wfx_get_prio_queue(struct wfx_vif *wvif,
tx_allowed_mask); tx_allowed_mask);
if (!queued) if (!queued)
continue; continue;
*total += queued;
score = ((edca->aifs + edca->cw_min) << 16) + score = ((edca->aifs + edca->cw_min) << 16) +
((edca->cw_max - edca->cw_min) * ((edca->cw_max - edca->cw_min) *
(get_random_int() & 0xFFFF)); (get_random_int() & 0xFFFF));
...@@ -390,7 +388,6 @@ static int wfx_tx_queue_mask_get(struct wfx_vif *wvif, ...@@ -390,7 +388,6 @@ static int wfx_tx_queue_mask_get(struct wfx_vif *wvif,
{ {
int idx; int idx;
u32 tx_allowed_mask; u32 tx_allowed_mask;
int total = 0;
/* Search for unicast traffic */ /* Search for unicast traffic */
tx_allowed_mask = ~wvif->sta_asleep_mask; tx_allowed_mask = ~wvif->sta_asleep_mask;
...@@ -399,7 +396,7 @@ static int wfx_tx_queue_mask_get(struct wfx_vif *wvif, ...@@ -399,7 +396,7 @@ static int wfx_tx_queue_mask_get(struct wfx_vif *wvif,
tx_allowed_mask &= ~BIT(WFX_LINK_ID_AFTER_DTIM); tx_allowed_mask &= ~BIT(WFX_LINK_ID_AFTER_DTIM);
else else
tx_allowed_mask |= BIT(WFX_LINK_ID_AFTER_DTIM); tx_allowed_mask |= BIT(WFX_LINK_ID_AFTER_DTIM);
idx = wfx_get_prio_queue(wvif, tx_allowed_mask, &total); idx = wfx_get_prio_queue(wvif, tx_allowed_mask);
if (idx < 0) if (idx < 0)
return -ENOENT; return -ENOENT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment