Return-path: Received: from mail-pw0-f46.google.com ([209.85.160.46]:47582 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752326Ab1ASP5C convert rfc822-to-8bit (ORCPT ); Wed, 19 Jan 2011 10:57:02 -0500 Received: by pwj3 with SMTP id 3so179802pwj.19 for ; Wed, 19 Jan 2011 07:57:02 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <20110119092113.19628.33322.stgit@localhost6.localdomain6> References: <20110119091949.19628.28309.stgit@localhost6.localdomain6> <20110119092113.19628.33322.stgit@localhost6.localdomain6> Date: Wed, 19 Jan 2011 17:57:02 +0200 Message-ID: Subject: Re: [PATCH 8/8] ath5k: Remove redundant sc->curband From: Nick Kossifidis To: Bruno Randolf Cc: linville@tuxdriver.com, linux-wireless@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: 2011/1/19 Bruno Randolf : > Remove sc->curband because the band is already stored in the current channel. > > Signed-off-by: Bruno Randolf > --- >  drivers/net/wireless/ath/ath5k/base.c |   11 ++++------- >  drivers/net/wireless/ath/ath5k/base.h |    2 -- >  2 files changed, 4 insertions(+), 9 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c > index a00cc11..0e39ee8 100644 > --- a/drivers/net/wireless/ath/ath5k/base.c > +++ b/drivers/net/wireless/ath/ath5k/base.c > @@ -551,7 +551,7 @@ ath5k_hw_to_driver_rix(struct ath5k_softc *sc, int hw_rix) >                        "hw_rix out of bounds: %x\n", hw_rix)) >                return 0; > > -       rix = sc->rate_idx[sc->curband->band][hw_rix]; > +       rix = sc->rate_idx[sc->curchan->band][hw_rix]; >        if (WARN(rix < 0, "invalid hw_rix: %x\n", hw_rix)) >                rix = 0; > > @@ -1361,7 +1361,7 @@ ath5k_receive_frame(struct ath5k_softc *sc, struct sk_buff *skb, >        rxs->flag |= RX_FLAG_TSFT; > >        rxs->freq = sc->curchan->center_freq; > -       rxs->band = sc->curband->band; > +       rxs->band = sc->curchan->band; > >        rxs->signal = sc->ah->ah_noise_floor + rs->rs_rssi; > > @@ -1376,7 +1376,7 @@ ath5k_receive_frame(struct ath5k_softc *sc, struct sk_buff *skb, >        rxs->flag |= ath5k_rx_decrypted(sc, skb, rs); > >        if (rxs->rate_idx >= 0 && rs->rs_rate == > -           sc->curband->bitrates[rxs->rate_idx].hw_value_short) > +           sc->sbands[sc->curchan->band].bitrates[rxs->rate_idx].hw_value_short) >                rxs->flag |= RX_FLAG_SHORTPRE; > >        ath5k_debug_dump_skb(sc, skb, "RX  ", 0); > @@ -2536,7 +2536,6 @@ ath5k_init_hw(struct ath5k_softc *sc) >         * and then setup of the interrupt mask. >         */ >        sc->curchan = sc->hw->conf.channel; > -       sc->curband = &sc->sbands[sc->curchan->band]; >        sc->imask = AR5K_INT_RXOK | AR5K_INT_RXERR | AR5K_INT_RXEOL | >                AR5K_INT_RXORN | AR5K_INT_TXDESC | AR5K_INT_TXEOL | >                AR5K_INT_FATAL | AR5K_INT_GLOBAL | AR5K_INT_MIB; > @@ -2663,10 +2662,8 @@ ath5k_reset(struct ath5k_softc *sc, struct ieee80211_channel *chan, >         * so we should also free any remaining >         * tx buffers */ >        ath5k_drain_tx_buffs(sc); > -       if (chan) { > +       if (chan) >                sc->curchan = chan; > -               sc->curband = &sc->sbands[chan->band]; > -       } >        ret = ath5k_hw_reset(ah, sc->opmode, sc->curchan, chan != NULL, >                                                                skip_pcu); >        if (ret) { > diff --git a/drivers/net/wireless/ath/ath5k/base.h b/drivers/net/wireless/ath/ath5k/base.h > index 58660e4..8f919dc 100644 > --- a/drivers/net/wireless/ath/ath5k/base.h > +++ b/drivers/net/wireless/ath/ath5k/base.h > @@ -183,8 +183,6 @@ struct ath5k_softc { >        enum nl80211_iftype     opmode; >        struct ath5k_hw         *ah;            /* Atheros HW */ > > -       struct ieee80211_supported_band         *curband; > - >  #ifdef CONFIG_ATH5K_DEBUG >        struct ath5k_dbg_info   debug;          /* debug info */ >  #endif /* CONFIG_ATH5K_DEBUG */ > Acked-by: Nick Kossifidis -- GPG ID: 0xD21DB2DB As you read this post global entropy rises. Have Fun ;-) Nick