Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/wireless/brcm80211/brcmsmac/ampdu.c

+2 −5
Original line number Diff line number Diff line
@@ -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 ((bindex < AMPDU_TX_BA_MAX_WSIZE)

			    && isset(bitmap, bindex)) {

				ini->tx_in_transit--;

				ini->txretry[index] = 0;



				/*
@@ -990,7 +989,6 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, 
			if (retry && (ini->txretry[index] < (int)retry_limit)) {

				int ret;

				ini->txretry[index]++;

				ini->tx_in_transit--;

				ret = brcms_c_txfifo(wlc, queue, p);

				/*

				 * 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, 
				WARN_ONCE(ret, "queue %d out of txds\n", queue);

			} else {

				/* Retry timeout */

				ini->tx_in_transit--;

				ieee80211_tx_info_clear_status(tx_info);

				tx_info->status.ampdu_ack_len = 0;

				tx_info->status.ampdu_len = 1;
@@ -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_TXH_LEN);

				brcms_dbg_ht(wlc->hw->d11core,

					     "BA Timeout, seq %d, in_transit %d\n",

					     seq, ini->tx_in_transit);

					     "BA Timeout, seq %d\n",

					     seq);

				ieee80211_tx_status_irqsafe(wlc->pub->ieee_hw,

							    p);

			}

drivers/net/wireless/brcm80211/brcmsmac/scb.h

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 


/* structure to store per-tid state for the ampdu initiator */

struct scb_ampdu_tid_ini {

	u8 tx_in_transit; /* number of pending mpdus in transit in driver */

	u8 tid;		  /* initiator tid for easy lookup */

	/* tx retry count; indexed by seq modulo */

	u8 txretry[AMPDU_TX_BA_MAX_WSIZE];