ath9k: Remove duplicate variables

A few variables (bssid, bssidmask, curaid) were duplicated in
struct ath_softc and in ath_hal, remove them.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 13 insertions, 11 deletions

diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index a1c76ec09b3a..bafefbed8382 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -905,8 +905,7 @@ static void ath9k_bss_assoc_info(struct ath_softc *sc,
                 /* New association, store aid */
                 if (avp->av_opmode == NL80211_IFTYPE_STATION) {
                         sc->curaid = bss_conf->aid;
-                        ath9k_hw_write_associd(sc->sc_ah, sc->curbssid,
-                                               sc->curaid);
+                        ath9k_hw_write_associd(sc);
                 }
 
                 /* Configure the beacon */
@@ -1514,11 +1513,10 @@ static int ath_init(u16 devid, struct ath_softc *sc)
         ath9k_hw_setcapability(ah, ATH9K_CAP_DIVERSITY, 1, true, NULL);
         sc->rx.defant = ath9k_hw_getdefantenna(ah);
 
-        ath9k_hw_getmac(ah, sc->macaddr);
         if (ah->ah_caps.hw_caps & ATH9K_HW_CAP_BSSIDMASK) {
-                ath9k_hw_getbssidmask(ah, sc->bssidmask);
+                memcpy(sc->bssidmask, ath_bcast_mac, ETH_ALEN);
                 ATH_SET_VIF_BSSID_MASK(sc->bssidmask);
-                ath9k_hw_setbssidmask(ah, sc->bssidmask);
+                ath9k_hw_setbssidmask(sc);
         }
 
         sc->beacon.slottime = ATH9K_SLOT_TIME_9;        /* default to short slot time */
@@ -1577,7 +1575,7 @@ int ath_attach(u16 devid, struct ath_softc *sc)
 
         /* get mac address from hardware and set in mac80211 */
 
-        SET_IEEE80211_PERM_ADDR(hw, sc->macaddr);
+        SET_IEEE80211_PERM_ADDR(hw, sc->sc_ah->macaddr);
 
         hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
                 IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
@@ -2285,7 +2283,9 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,
             ah->ah_opmode != NL80211_IFTYPE_AP) {
                 ah->ah_opmode = NL80211_IFTYPE_STATION;
                 ath9k_hw_setopmode(ah);
-                ath9k_hw_write_associd(ah, sc->macaddr, 0);
+                memcpy(sc->curbssid, sc->sc_ah->macaddr, ETH_ALEN);
+                sc->curaid = 0;
+                ath9k_hw_write_associd(sc);
                 /* Request full reset to get hw opmode changed properly */
                 sc->sc_flags |= SC_OP_FULL_RESET;
         }
@@ -2298,8 +2298,7 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,
                         /* Set BSSID */
                         memcpy(sc->curbssid, conf->bssid, ETH_ALEN);
                         sc->curaid = 0;
-                        ath9k_hw_write_associd(sc->sc_ah, sc->curbssid,
-                                               sc->curaid);
+                        ath9k_hw_write_associd(sc);
 
                         /* Set aggregation protection mode parameters */
                         sc->config.ath_aggr_prot = 0;
@@ -2382,8 +2381,11 @@ static void ath9k_configure_filter(struct ieee80211_hw *hw,
         ath9k_hw_setrxfilter(sc->sc_ah, rfilt);
 
         if (changed_flags & FIF_BCN_PRBRESP_PROMISC) {
-                if (*total_flags & FIF_BCN_PRBRESP_PROMISC)
-                        ath9k_hw_write_associd(sc->sc_ah, ath_bcast_mac, 0);
+                if (*total_flags & FIF_BCN_PRBRESP_PROMISC) {
+                        memcpy(sc->curbssid, ath_bcast_mac, ETH_ALEN);
+                        sc->curaid = 0;
+                        ath9k_hw_write_associd(sc);
+                }
         }
 
         DPRINTF(sc, ATH_DBG_CONFIG, "Set HW RX filter: 0x%x\n", sc->rx.rxfilter);