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

Commit 62412a8f authored by Bruno Randolf's avatar Bruno Randolf Committed by John W. Linville
Browse files

ath5k: remove pointless rx error overlay struct 



ath5k_hw_rx_error was only used once, where we could easily just use
ath5k_hw_rx_status as well, so remove it.

Signed-off-by: default avatarBruno Randolf <br1@einfach.org>
Acked-by: default avatarBob Copeland <me@bobcopeland.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2847109f

drivers/net/wireless/ath/ath5k/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -925,7 +925,7 @@ ath5k_debug_printrxbuf(struct ath5k_buf *bf, int done, 
		ds, (unsigned long long)bf->daddr,

		ds->ds_link, ds->ds_data,

		rd->rx_ctl.rx_control_0, rd->rx_ctl.rx_control_1,

		rd->u.rx_stat.rx_status_0, rd->u.rx_stat.rx_status_1,

		rd->rx_stat.rx_status_0, rd->rx_stat.rx_status_1,

		!done ? ' ' : (rs->rs_status == 0) ? '*' : '!');

}

drivers/net/wireless/ath/ath5k/desc.c

+4 −8
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah, 
{

	struct ath5k_hw_rx_status *rx_status;



	rx_status = &desc->ud.ds_rx.u.rx_stat;

	rx_status = &desc->ud.ds_rx.rx_stat;



	/* No frame received / not ready */

	if (unlikely(!(rx_status->rx_status_1 &
@@ -581,12 +581,8 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah, 
					struct ath5k_rx_status *rs)

{

	struct ath5k_hw_rx_status *rx_status;

	struct ath5k_hw_rx_error *rx_err;



	rx_status = &desc->ud.ds_rx.u.rx_stat;



	/* Overlay on error */

	rx_err = &desc->ud.ds_rx.u.rx_err;

	rx_status = &desc->ud.ds_rx.rx_stat;



	/* No frame received / not ready */

	if (unlikely(!(rx_status->rx_status_1 &
@@ -632,8 +628,8 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah, 
		if (rx_status->rx_status_1 &

				AR5K_5212_RX_DESC_STATUS1_PHY_ERROR) {

			rs->rs_status |= AR5K_RXERR_PHY;

			rs->rs_phyerr |= AR5K_REG_MS(rx_err->rx_error_1,

					   AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE);

			rs->rs_phyerr |= AR5K_REG_MS(rx_status->rx_status_1,

				AR5K_5212_RX_DESC_STATUS1_PHY_ERROR_CODE);

			ath5k_ani_phy_error_report(ah, rs->rs_phyerr);

		}

drivers/net/wireless/ath/ath5k/desc.h

+4 −20
Original line number Diff line number Diff line
@@ -96,21 +96,8 @@ struct ath5k_hw_rx_status { 
#define AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP	0x7fff0000

#define AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP_S	16

#define AR5K_5212_RX_DESC_STATUS1_KEY_CACHE_MISS	0x80000000



/*

 * common hardware RX error descriptor

 */

struct ath5k_hw_rx_error {

	u32	rx_error_0; /* RX status word 0 */

	u32	rx_error_1; /* RX status word 1 */

} __packed;



/* RX error word 0 fields/flags */

#define AR5K_RX_DESC_ERROR0			0x00000000



/* RX error word 1 fields/flags */

#define AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE	0x0000ff00

#define AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE_S	8

#define AR5K_5212_RX_DESC_STATUS1_PHY_ERROR_CODE	0x0000ff00

#define AR5K_5212_RX_DESC_STATUS1_PHY_ERROR_CODE_S	8



/**

 * enum ath5k_phy_error_code - PHY Error codes
@@ -317,10 +304,7 @@ struct ath5k_hw_5212_tx_desc { 
 */

struct ath5k_hw_all_rx_desc {

	struct ath5k_hw_rx_ctl		rx_ctl;

	union {

	struct ath5k_hw_rx_status	rx_stat;

		struct ath5k_hw_rx_error	rx_err;

	} u;

} __packed;



/*