2011/1/19 Bruno Randolf <br1@xxxxxxxxxxx>:
> sc->curmode is set but never used. Remove it and the helper function. Also the
> ath5k_rate_update which is refered to in the comment does not exist (any more?)
> so we don't need to setup the band in that place.
>
> Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
> ---
> Âdrivers/net/wireless/ath/ath5k/base.c | Â 18 ------------------
> Âdrivers/net/wireless/ath/ath5k/base.h | Â Â1 -
> Â2 files changed, 0 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
> index 6900543..a00cc11 100644
> --- a/drivers/net/wireless/ath/ath5k/base.c
> +++ b/drivers/net/wireless/ath/ath5k/base.c
> @@ -439,18 +439,6 @@ ath5k_chan_set(struct ath5k_softc *sc, struct ieee80211_channel *chan)
> Â Â Â Âreturn ath5k_reset(sc, chan, true);
> Â}
>
> -static void
> -ath5k_setcurmode(struct ath5k_softc *sc, unsigned int mode)
> -{
> - Â Â Â sc->curmode = mode;
> -
> - Â Â Â if (mode == AR5K_MODE_11A) {
> - Â Â Â Â Â Â Â sc->curband = &sc->sbands[IEEE80211_BAND_5GHZ];
> - Â Â Â } else {
> - Â Â Â Â Â Â Â sc->curband = &sc->sbands[IEEE80211_BAND_2GHZ];
> - Â Â Â }
> -}
> -
> Âstruct ath_vif_iter_data {
> Â Â Â Âconst u8 Â Â Â Â*hw_macaddr;
> Â Â Â Âu8 Â Â Â Â Â Â Âmask[ETH_ALEN];
> @@ -2776,12 +2764,6 @@ ath5k_init(struct ieee80211_hw *hw)
> Â Â Â Â Â Â Â Âgoto err;
> Â Â Â Â}
>
> - Â Â Â /* NB: setup here so ath5k_rate_update is happy */
> - Â Â Â if (test_bit(AR5K_MODE_11A, ah->ah_modes))
> - Â Â Â Â Â Â Â ath5k_setcurmode(sc, AR5K_MODE_11A);
> - Â Â Â else
> - Â Â Â Â Â Â Â ath5k_setcurmode(sc, AR5K_MODE_11B);
> -
> Â Â Â Â/*
> Â Â Â Â * Allocate tx+rx descriptors and populate the lists.
> Â Â Â Â */
> diff --git a/drivers/net/wireless/ath/ath5k/base.h b/drivers/net/wireless/ath/ath5k/base.h
> index 6d51147..58660e4 100644
> --- a/drivers/net/wireless/ath/ath5k/base.h
> +++ b/drivers/net/wireless/ath/ath5k/base.h
> @@ -202,7 +202,6 @@ struct ath5k_softc {
> Â#define ATH_STAT_STARTED Â Â Â 4 Â Â Â Â Â Â Â /* opened & irqs enabled */
>
>    Âunsigned int      Âfilter_flags;  /* HW flags, AR5K_RX_FILTER_* */
> -    unsigned int      Âcurmode;    Â/* current phy mode */
> Â Â Â Âstruct ieee80211_channel *curchan; Â Â Â/* current h/w channel */
>
> Â Â Â Âu16 Â Â Â Â Â Â Â Â Â Â nvifs;
>
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
