diff options
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index e453212fa17f..af25c4e7ec5c 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -297,9 +297,8 @@ ieee80211_tx_h_check_assoc(struct ieee80211_tx_data *tx) | |||
297 | if (unlikely(!assoc && | 297 | if (unlikely(!assoc && |
298 | ieee80211_is_data(hdr->frame_control))) { | 298 | ieee80211_is_data(hdr->frame_control))) { |
299 | #ifdef CONFIG_MAC80211_VERBOSE_DEBUG | 299 | #ifdef CONFIG_MAC80211_VERBOSE_DEBUG |
300 | printk(KERN_DEBUG "%s: dropped data frame to not " | 300 | pr_debug("%s: dropped data frame to not associated station %pM\n", |
301 | "associated station %pM\n", | 301 | tx->sdata->name, hdr->addr1); |
302 | tx->sdata->name, hdr->addr1); | ||
303 | #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */ | 302 | #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */ |
304 | I802_DEBUG_INC(tx->local->tx_handlers_drop_not_assoc); | 303 | I802_DEBUG_INC(tx->local->tx_handlers_drop_not_assoc); |
305 | return TX_DROP; | 304 | return TX_DROP; |
@@ -467,8 +466,8 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx) | |||
467 | } | 466 | } |
468 | 467 | ||
469 | #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG | 468 | #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG |
470 | printk(KERN_DEBUG "STA %pM aid %d: PS buffer for AC %d\n", | 469 | pr_debug("STA %pM aid %d: PS buffer for AC %d\n", |
471 | sta->sta.addr, sta->sta.aid, ac); | 470 | sta->sta.addr, sta->sta.aid, ac); |
472 | #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ | 471 | #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ |
473 | if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER) | 472 | if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER) |
474 | purge_old_ps_buffers(tx->local); | 473 | purge_old_ps_buffers(tx->local); |
@@ -502,9 +501,8 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx) | |||
502 | } | 501 | } |
503 | #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG | 502 | #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG |
504 | else if (unlikely(test_sta_flag(sta, WLAN_STA_PS_STA))) { | 503 | else if (unlikely(test_sta_flag(sta, WLAN_STA_PS_STA))) { |
505 | printk(KERN_DEBUG | 504 | pr_debug("%s: STA %pM in PS mode, but polling/in SP -> send frame\n", |
506 | "%s: STA %pM in PS mode, but polling/in SP -> send frame\n", | 505 | tx->sdata->name, sta->sta.addr); |
507 | tx->sdata->name, sta->sta.addr); | ||
508 | } | 506 | } |
509 | #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ | 507 | #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ |
510 | 508 | ||