aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/agg-rx.c13
-rw-r--r--net/mac80211/ht.c8
-rw-r--r--net/mac80211/ibss.c10
-rw-r--r--net/mac80211/mlme.c12
-rw-r--r--net/mac80211/rx.c11
-rw-r--r--net/mac80211/tx.c17
6 files changed, 28 insertions, 43 deletions
diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c
index a070d4f460ea..26ddb699d693 100644
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
@@ -260,11 +260,8 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
260 (buf_size > IEEE80211_MAX_AMPDU_BUF)) { 260 (buf_size > IEEE80211_MAX_AMPDU_BUF)) {
261 status = WLAN_STATUS_INVALID_QOS_PARAM; 261 status = WLAN_STATUS_INVALID_QOS_PARAM;
262#ifdef CONFIG_MAC80211_HT_DEBUG 262#ifdef CONFIG_MAC80211_HT_DEBUG
263 if (net_ratelimit()) 263 net_dbg_ratelimited("AddBA Req with bad params from %pM on tid %u. policy %d, buffer size %d\n",
264 printk(KERN_DEBUG "AddBA Req with bad params from " 264 mgmt->sa, tid, ba_policy, buf_size);
265 "%pM on tid %u. policy %d, buffer size %d\n",
266 mgmt->sa, tid, ba_policy,
267 buf_size);
268#endif /* CONFIG_MAC80211_HT_DEBUG */ 265#endif /* CONFIG_MAC80211_HT_DEBUG */
269 goto end_no_lock; 266 goto end_no_lock;
270 } 267 }
@@ -281,10 +278,8 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
281 278
282 if (sta->ampdu_mlme.tid_rx[tid]) { 279 if (sta->ampdu_mlme.tid_rx[tid]) {
283#ifdef CONFIG_MAC80211_HT_DEBUG 280#ifdef CONFIG_MAC80211_HT_DEBUG
284 if (net_ratelimit()) 281 net_dbg_ratelimited("unexpected AddBA Req from %pM on tid %u\n",
285 printk(KERN_DEBUG "unexpected AddBA Req from " 282 mgmt->sa, tid);
286 "%pM on tid %u\n",
287 mgmt->sa, tid);
288#endif /* CONFIG_MAC80211_HT_DEBUG */ 283#endif /* CONFIG_MAC80211_HT_DEBUG */
289 284
290 /* delete existing Rx BA session on the same tid */ 285 /* delete existing Rx BA session on the same tid */
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index 9b603366943c..6f8615c54b22 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -306,10 +306,10 @@ void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
306 initiator = (params & IEEE80211_DELBA_PARAM_INITIATOR_MASK) >> 11; 306 initiator = (params & IEEE80211_DELBA_PARAM_INITIATOR_MASK) >> 11;
307 307
308#ifdef CONFIG_MAC80211_HT_DEBUG 308#ifdef CONFIG_MAC80211_HT_DEBUG
309 if (net_ratelimit()) 309 net_dbg_ratelimited("delba from %pM (%s) tid %d reason code %d\n",
310 printk(KERN_DEBUG "delba from %pM (%s) tid %d reason code %d\n", 310 mgmt->sa, initiator ? "initiator" : "recipient",
311 mgmt->sa, initiator ? "initiator" : "recipient", tid, 311 tid,
312 le16_to_cpu(mgmt->u.action.u.delba.reason_code)); 312 le16_to_cpu(mgmt->u.action.u.delba.reason_code));
313#endif /* CONFIG_MAC80211_HT_DEBUG */ 313#endif /* CONFIG_MAC80211_HT_DEBUG */
314 314
315 if (initiator == WLAN_BACK_INITIATOR) 315 if (initiator == WLAN_BACK_INITIATOR)
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index ebafba61c2ff..3ad33a824624 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -303,9 +303,8 @@ ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata,
303 * allow new one to be added. 303 * allow new one to be added.
304 */ 304 */
305 if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) { 305 if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
306 if (net_ratelimit()) 306 net_dbg_ratelimited("%s: No room for a new IBSS STA entry %pM\n",
307 printk(KERN_DEBUG "%s: No room for a new IBSS STA entry %pM\n", 307 sdata->name, addr);
308 sdata->name, addr);
309 rcu_read_lock(); 308 rcu_read_lock();
310 return NULL; 309 return NULL;
311 } 310 }
@@ -582,9 +581,8 @@ void ieee80211_ibss_rx_no_sta(struct ieee80211_sub_if_data *sdata,
582 * allow new one to be added. 581 * allow new one to be added.
583 */ 582 */
584 if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) { 583 if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
585 if (net_ratelimit()) 584 net_dbg_ratelimited("%s: No room for a new IBSS STA entry %pM\n",
586 printk(KERN_DEBUG "%s: No room for a new IBSS STA entry %pM\n", 585 sdata->name, addr);
587 sdata->name, addr);
588 return; 586 return;
589 } 587 }
590 588
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 52cd301245ae..b3b3c264ff66 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1567,9 +1567,9 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata,
1567 } 1567 }
1568 1568
1569#ifdef CONFIG_MAC80211_VERBOSE_DEBUG 1569#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
1570 if (beacon && net_ratelimit()) 1570 if (beacon)
1571 printk(KERN_DEBUG "%s: detected beacon loss from AP " 1571 net_dbg_ratelimited("%s: detected beacon loss from AP - sending probe request\n",
1572 "- sending probe request\n", sdata->name); 1572 sdata->name);
1573#endif 1573#endif
1574 1574
1575 /* 1575 /*
@@ -2404,10 +2404,8 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
2404 2404
2405 if (ifmgd->flags & IEEE80211_STA_BEACON_POLL) { 2405 if (ifmgd->flags & IEEE80211_STA_BEACON_POLL) {
2406#ifdef CONFIG_MAC80211_VERBOSE_DEBUG 2406#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
2407 if (net_ratelimit()) { 2407 net_dbg_ratelimited("%s: cancelling probereq poll due to a received beacon\n",
2408 printk(KERN_DEBUG "%s: cancelling probereq poll due " 2408 sdata->name);
2409 "to a received beacon\n", sdata->name);
2410 }
2411#endif 2409#endif
2412 ifmgd->flags &= ~IEEE80211_STA_BEACON_POLL; 2410 ifmgd->flags &= ~IEEE80211_STA_BEACON_POLL;
2413 mutex_lock(&local->iflist_mtx); 2411 mutex_lock(&local->iflist_mtx);
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index d722c40c7eca..8257a09eeed4 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1752,9 +1752,9 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
1752 * local net stack and back to the wireless medium 1752 * local net stack and back to the wireless medium
1753 */ 1753 */
1754 xmit_skb = skb_copy(skb, GFP_ATOMIC); 1754 xmit_skb = skb_copy(skb, GFP_ATOMIC);
1755 if (!xmit_skb && net_ratelimit()) 1755 if (!xmit_skb)
1756 printk(KERN_DEBUG "%s: failed to clone " 1756 net_dbg_ratelimited("%s: failed to clone multicast frame\n",
1757 "multicast frame\n", dev->name); 1757 dev->name);
1758 } else { 1758 } else {
1759 dsta = sta_info_get(sdata, skb->data); 1759 dsta = sta_info_get(sdata, skb->data);
1760 if (dsta) { 1760 if (dsta) {
@@ -1957,9 +1957,8 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
1957 1957
1958 fwd_skb = skb_copy(skb, GFP_ATOMIC); 1958 fwd_skb = skb_copy(skb, GFP_ATOMIC);
1959 if (!fwd_skb) { 1959 if (!fwd_skb) {
1960 if (net_ratelimit()) 1960 net_dbg_ratelimited("%s: failed to clone mesh frame\n",
1961 printk(KERN_DEBUG "%s: failed to clone mesh frame\n", 1961 sdata->name);
1962 sdata->name);
1963 goto out; 1962 goto out;
1964 } 1963 }
1965 1964
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index e03abc78ee53..5f827a6b0d8d 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -413,9 +413,8 @@ ieee80211_tx_h_multicast_ps_buf(struct ieee80211_tx_data *tx)
413 413
414 if (skb_queue_len(&tx->sdata->bss->ps_bc_buf) >= AP_MAX_BC_BUFFER) { 414 if (skb_queue_len(&tx->sdata->bss->ps_bc_buf) >= AP_MAX_BC_BUFFER) {
415#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG 415#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
416 if (net_ratelimit()) 416 net_dbg_ratelimited("%s: BC TX buffer full - dropping the oldest frame\n",
417 printk(KERN_DEBUG "%s: BC TX buffer full - dropping the oldest frame\n", 417 tx->sdata->name);
418 tx->sdata->name);
419#endif 418#endif
420 dev_kfree_skb(skb_dequeue(&tx->sdata->bss->ps_bc_buf)); 419 dev_kfree_skb(skb_dequeue(&tx->sdata->bss->ps_bc_buf));
421 } else 420 } else
@@ -476,10 +475,8 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx)
476 if (skb_queue_len(&sta->ps_tx_buf[ac]) >= STA_MAX_TX_BUFFER) { 475 if (skb_queue_len(&sta->ps_tx_buf[ac]) >= STA_MAX_TX_BUFFER) {
477 struct sk_buff *old = skb_dequeue(&sta->ps_tx_buf[ac]); 476 struct sk_buff *old = skb_dequeue(&sta->ps_tx_buf[ac]);
478#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG 477#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
479 if (net_ratelimit()) 478 net_dbg_ratelimited("%s: STA %pM TX buffer for AC %d full - dropping oldest frame\n",
480 printk(KERN_DEBUG "%s: STA %pM TX buffer for " 479 tx->sdata->name, sta->sta.addr, ac);
481 "AC %d full - dropping oldest frame\n",
482 tx->sdata->name, sta->sta.addr, ac);
483#endif 480#endif
484 dev_kfree_skb(old); 481 dev_kfree_skb(old);
485 } else 482 } else
@@ -1965,10 +1962,8 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
1965 (cpu_to_be16(ethertype) != sdata->control_port_protocol || 1962 (cpu_to_be16(ethertype) != sdata->control_port_protocol ||
1966 !ether_addr_equal(sdata->vif.addr, skb->data + ETH_ALEN)))) { 1963 !ether_addr_equal(sdata->vif.addr, skb->data + ETH_ALEN)))) {
1967#ifdef CONFIG_MAC80211_VERBOSE_DEBUG 1964#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
1968 if (net_ratelimit()) 1965 net_dbg_ratelimited("%s: dropped frame to %pM (unauthorized port)\n",
1969 printk(KERN_DEBUG "%s: dropped frame to %pM" 1966 dev->name, hdr.addr1);
1970 " (unauthorized port)\n", dev->name,
1971 hdr.addr1);
1972#endif 1967#endif
1973 1968
1974 I802_DEBUG_INC(local->tx_handlers_drop_unauth_port); 1969 I802_DEBUG_INC(local->tx_handlers_drop_unauth_port);
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-12 21:17:58 -0400