Commit 637ccc27 authored by Piotr Haber's avatar Piotr Haber Committed by John W. Linville

brcmsmac: remove dead code

Dead code after AMPDU restructure.
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarPiotr Haber <phaber@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b180b100
...@@ -961,7 +961,6 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, ...@@ -961,7 +961,6 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
/* if acked then clear bit and free packet */ /* if acked then clear bit and free packet */
if ((bindex < AMPDU_TX_BA_MAX_WSIZE) if ((bindex < AMPDU_TX_BA_MAX_WSIZE)
&& isset(bitmap, bindex)) { && isset(bitmap, bindex)) {
ini->tx_in_transit--;
ini->txretry[index] = 0; ini->txretry[index] = 0;
/* /*
...@@ -990,7 +989,6 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, ...@@ -990,7 +989,6 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
if (retry && (ini->txretry[index] < (int)retry_limit)) { if (retry && (ini->txretry[index] < (int)retry_limit)) {
int ret; int ret;
ini->txretry[index]++; ini->txretry[index]++;
ini->tx_in_transit--;
ret = brcms_c_txfifo(wlc, queue, p); ret = brcms_c_txfifo(wlc, queue, p);
/* /*
* We shouldn't be out of space in the DMA * We shouldn't be out of space in the DMA
...@@ -1000,7 +998,6 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, ...@@ -1000,7 +998,6 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
WARN_ONCE(ret, "queue %d out of txds\n", queue); WARN_ONCE(ret, "queue %d out of txds\n", queue);
} else { } else {
/* Retry timeout */ /* Retry timeout */
ini->tx_in_transit--;
ieee80211_tx_info_clear_status(tx_info); ieee80211_tx_info_clear_status(tx_info);
tx_info->status.ampdu_ack_len = 0; tx_info->status.ampdu_ack_len = 0;
tx_info->status.ampdu_len = 1; tx_info->status.ampdu_len = 1;
...@@ -1009,8 +1006,8 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, ...@@ -1009,8 +1006,8 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
skb_pull(p, D11_PHY_HDR_LEN); skb_pull(p, D11_PHY_HDR_LEN);
skb_pull(p, D11_TXH_LEN); skb_pull(p, D11_TXH_LEN);
brcms_dbg_ht(wlc->hw->d11core, brcms_dbg_ht(wlc->hw->d11core,
"BA Timeout, seq %d, in_transit %d\n", "BA Timeout, seq %d\n",
seq, ini->tx_in_transit); seq);
ieee80211_tx_status_irqsafe(wlc->pub->ieee_hw, ieee80211_tx_status_irqsafe(wlc->pub->ieee_hw,
p); p);
} }
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
/* structure to store per-tid state for the ampdu initiator */ /* structure to store per-tid state for the ampdu initiator */
struct scb_ampdu_tid_ini { struct scb_ampdu_tid_ini {
u8 tx_in_transit; /* number of pending mpdus in transit in driver */
u8 tid; /* initiator tid for easy lookup */ u8 tid; /* initiator tid for easy lookup */
/* tx retry count; indexed by seq modulo */ /* tx retry count; indexed by seq modulo */
u8 txretry[AMPDU_TX_BA_MAX_WSIZE]; u8 txretry[AMPDU_TX_BA_MAX_WSIZE];
......
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