2007/11/1, Luis R. Rodriguez <mcgrof@xxxxxxxxx>:
> Clear up settings of AR5K_RSSI_THR register settings. These are split between
> AR5K_TUNE_BMISS_THRES and AR5K_TUNE_RSSI_THRES.
>
> Changes to ath5k.h, hw.c
> Changes-licensed-under: ISC
>
> Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxxx>
> ---
> drivers/net/wireless/ath5k/ath5k.h | 10 +++++++++-
> drivers/net/wireless/ath5k/hw.c | 11 ++++-------
> 2 files changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/wireless/ath5k/ath5k.h b/drivers/net/wireless/ath5k/ath5k.h
> index 3354b37..c8ab09a 100644
> --- a/drivers/net/wireless/ath5k/ath5k.h
> +++ b/drivers/net/wireless/ath5k/ath5k.h
> @@ -86,8 +86,16 @@
> #define AR5K_TUNE_RADAR_ALERT false
> #define AR5K_TUNE_MIN_TX_FIFO_THRES 1
> #define AR5K_TUNE_MAX_TX_FIFO_THRES ((IEEE80211_MAX_LEN / 64) + 1)
> -#define AR5K_TUNE_RSSI_THRES 1792
> #define AR5K_TUNE_REGISTER_TIMEOUT 20000
> +/* Register for RSSI threshold has a mask of 0xff, so 255 seems to
> + * be the max value. */
> +#define AR5K_TUNE_RSSI_THRES 129
> +/* This must be set when setting the RSSI threshold otherwise it can
> + * prevent a reset. If AR5K_RSSI_THR is read after writing to it
> + * the BMISS_THRES will be seen as 0, seems harware doesn't keep
> + * track of it. Max value depends on harware. For AR5210 this is just 7.
> + * For AR5211+ this seems to be up to 255. */
> +#define AR5K_TUNE_BMISS_THRES 7
> #define AR5K_TUNE_REGISTER_DWELL_TIME 20000
> #define AR5K_TUNE_BEACON_INTERVAL 100
> #define AR5K_TUNE_AIFS 2
> diff --git a/drivers/net/wireless/ath5k/hw.c b/drivers/net/wireless/ath5k/hw.c
> index 1b9c4f0..f1ba863 100644
> --- a/drivers/net/wireless/ath5k/hw.c
> +++ b/drivers/net/wireless/ath5k/hw.c
> @@ -849,13 +849,10 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
> /*PISR/SISR Not available on 5210*/
> if (ah->ah_version != AR5K_AR5210) {
> ath5k_hw_reg_write(ah, 0xffffffff, AR5K_PISR);
> - /* XXX: AR5K_RSSI_THR has masks and shifts defined for it, so
> - * direct write using ath5k_hw_reg_write seems wrong. Test with:
> - * AR5K_REG_WRITE_BITS(ah, AR5K_RSSI_THR,
> - * AR5K_RSSI_THR_BMISS, AR5K_TUNE_RSSI_THRES);
> - * with different variables and check results compared
> - * to ath5k_hw_reg_write(ah, ) */
> - ath5k_hw_reg_write(ah, AR5K_TUNE_RSSI_THRES, AR5K_RSSI_THR);
> + /* If we later allow tuning for this, store into sc structure */
> + data = AR5K_TUNE_RSSI_THRES |
> + AR5K_TUNE_BMISS_THRES << AR5K_RSSI_THR_BMISS_S;
> + ath5k_hw_reg_write(ah, data, AR5K_RSSI_THR);
> }
>
> /*
> --
> 1.5.2.5
>
>
Acked-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
--
GPG ID: 0xD21DB2DB
As you read this post global entropy rises. Have Fun ;-)
Nick
-
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
