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

Commit b6127980 authored by Nick Kossifidis's avatar Nick Kossifidis Committed by John W. Linville
Browse files

ath5k: remove own (wrong) IEEE80211_MAX_LEN 



Use the version already supplied in include/linux/ieee80211.h.

Signed-off-by: default avatarBob Copeland <me@bobcopeland.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 418de6d9

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

+1 −4
Original line number Original line Diff line number Diff line
@@ -175,7 +175,7 @@ 
#define AR5K_TUNE_ADDITIONAL_SWBA_BACKOFF	0

#define AR5K_TUNE_ADDITIONAL_SWBA_BACKOFF	0

#define AR5K_TUNE_RADAR_ALERT			false

#define AR5K_TUNE_RADAR_ALERT			false

#define AR5K_TUNE_MIN_TX_FIFO_THRES		1

#define AR5K_TUNE_MIN_TX_FIFO_THRES		1

#define AR5K_TUNE_MAX_TX_FIFO_THRES		((IEEE80211_MAX_LEN / 64) + 1)

#define AR5K_TUNE_MAX_TX_FIFO_THRES	((IEEE80211_MAX_FRAME_LEN / 64) + 1)

#define AR5K_TUNE_REGISTER_TIMEOUT		20000

#define AR5K_TUNE_REGISTER_TIMEOUT		20000

/* Register for RSSI threshold has a mask of 0xff, so 255 seems to

/* Register for RSSI threshold has a mask of 0xff, so 255 seems to

 * be the max value. */

 * be the max value. */
@@ -343,9 +343,6 @@ struct ath5k_srev_name { 
#define AR5K_SREV_PHY_5413	0x61

#define AR5K_SREV_PHY_5413	0x61

#define AR5K_SREV_PHY_2425	0x70

#define AR5K_SREV_PHY_2425	0x70





/* IEEE defs */

#define IEEE80211_MAX_LEN       2500



/* TODO add support to mac80211 for vendor-specific rates and modes */

/* TODO add support to mac80211 for vendor-specific rates and modes */





/*

/*

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1709,7 +1709,7 @@ ath5k_rx_start(struct ath5k_softc *sc) 
	struct ath5k_buf *bf;

	struct ath5k_buf *bf;

	int ret;

	int ret;





	common->rx_bufsize = roundup(IEEE80211_MAX_LEN, common->cachelsz);

	common->rx_bufsize = roundup(IEEE80211_MAX_FRAME_LEN, common->cachelsz);





	ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "cachelsz %u rx_bufsize %u\n",

	ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "cachelsz %u rx_bufsize %u\n",

		  common->cachelsz, common->rx_bufsize);

		  common->cachelsz, common->rx_bufsize);