diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rs.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c index e2a58e477036..b497d40dc396 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c | |||
@@ -357,11 +357,9 @@ static void rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv, | |||
357 | struct iwl_lq_sta *lq_data, u8 tid, | 357 | struct iwl_lq_sta *lq_data, u8 tid, |
358 | struct ieee80211_sta *sta) | 358 | struct ieee80211_sta *sta) |
359 | { | 359 | { |
360 | DECLARE_MAC_BUF(mac); | ||
361 | |||
362 | if (rs_tl_get_load(lq_data, tid) > IWL_AGG_LOAD_THRESHOLD) { | 360 | if (rs_tl_get_load(lq_data, tid) > IWL_AGG_LOAD_THRESHOLD) { |
363 | IWL_DEBUG_HT("Starting Tx agg: STA: %s tid: %d\n", | 361 | IWL_DEBUG_HT("Starting Tx agg: STA: %pM tid: %d\n", |
364 | print_mac(mac, sta->addr), tid); | 362 | sta->addr, tid); |
365 | ieee80211_start_tx_ba_session(priv->hw, sta->addr, tid); | 363 | ieee80211_start_tx_ba_session(priv->hw, sta->addr, tid); |
366 | } | 364 | } |
367 | } | 365 | } |
@@ -2132,11 +2130,10 @@ static void rs_get_rate(void *priv_r, struct ieee80211_supported_band *sband, | |||
2132 | if ((priv->iw_mode == NL80211_IFTYPE_ADHOC) && | 2130 | if ((priv->iw_mode == NL80211_IFTYPE_ADHOC) && |
2133 | !lq_sta->ibss_sta_added) { | 2131 | !lq_sta->ibss_sta_added) { |
2134 | u8 sta_id = iwl_find_station(priv, hdr->addr1); | 2132 | u8 sta_id = iwl_find_station(priv, hdr->addr1); |
2135 | DECLARE_MAC_BUF(mac); | ||
2136 | 2133 | ||
2137 | if (sta_id == IWL_INVALID_STATION) { | 2134 | if (sta_id == IWL_INVALID_STATION) { |
2138 | IWL_DEBUG_RATE("LQ: ADD station %s\n", | 2135 | IWL_DEBUG_RATE("LQ: ADD station %pM\n", |
2139 | print_mac(mac, hdr->addr1)); | 2136 | hdr->addr1); |
2140 | sta_id = iwl_add_station_flags(priv, hdr->addr1, | 2137 | sta_id = iwl_add_station_flags(priv, hdr->addr1, |
2141 | 0, CMD_ASYNC, NULL); | 2138 | 0, CMD_ASYNC, NULL); |
2142 | } | 2139 | } |
@@ -2205,15 +2202,12 @@ static void rs_rate_init(void *priv_r, struct ieee80211_supported_band *sband, | |||
2205 | lq_sta->ibss_sta_added = 0; | 2202 | lq_sta->ibss_sta_added = 0; |
2206 | if (priv->iw_mode == NL80211_IFTYPE_AP) { | 2203 | if (priv->iw_mode == NL80211_IFTYPE_AP) { |
2207 | u8 sta_id = iwl_find_station(priv, sta->addr); | 2204 | u8 sta_id = iwl_find_station(priv, sta->addr); |
2208 | DECLARE_MAC_BUF(mac); | ||
2209 | 2205 | ||
2210 | /* for IBSS the call are from tasklet */ | 2206 | /* for IBSS the call are from tasklet */ |
2211 | IWL_DEBUG_RATE("LQ: ADD station %s\n", | 2207 | IWL_DEBUG_RATE("LQ: ADD station %pM\n", sta->addr); |
2212 | print_mac(mac, sta->addr)); | ||
2213 | 2208 | ||
2214 | if (sta_id == IWL_INVALID_STATION) { | 2209 | if (sta_id == IWL_INVALID_STATION) { |
2215 | IWL_DEBUG_RATE("LQ: ADD station %s\n", | 2210 | IWL_DEBUG_RATE("LQ: ADD station %pM\n", sta->addr); |
2216 | print_mac(mac, sta->addr)); | ||
2217 | sta_id = iwl_add_station_flags(priv, sta->addr, | 2211 | sta_id = iwl_add_station_flags(priv, sta->addr, |
2218 | 0, CMD_ASYNC, NULL); | 2212 | 0, CMD_ASYNC, NULL); |
2219 | } | 2213 | } |