iwlegacy: move bcast_sta_id to hw_params

[cascardo/linux.git] / drivers / net / wireless / iwlegacy / 3945-rs.c

diff --git a/drivers/net/wireless/iwlegacy/3945-rs.c b/drivers/net/wireless/iwlegacy/3945-rs.c
index d7a83f2..6a782b5 100644 (file)
--- a/drivers/net/wireless/iwlegacy/3945-rs.c
+++ b/drivers/net/wireless/iwlegacy/3945-rs.c
@@ -342,7 +342,7 @@ il3945_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta, u8 sta_id)
        int i;
 
        D_INFO("enter\n");
-       if (sta_id == il->ctx.bcast_sta_id)
+       if (sta_id == il->hw_params.bcast_id)
                goto out;
 
        psta = (struct il3945_sta_priv *)sta->drv_priv;
@@ -944,7 +944,7 @@ il3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
        switch (il->band) {
        case IEEE80211_BAND_2GHZ:
                /* TODO: this always does G, not a regression */
-               if (il->ctx.active.flags & RXON_FLG_TGG_PROTECT_MSK) {
+               if (il->active.flags & RXON_FLG_TGG_PROTECT_MSK) {
                        rs_sta->tgg = 1;
                        rs_sta->expected_tpt = il3945_expected_tpt_g_prot;
                } else