mac80211: clean up debugging

There are a few things that make the logging and
debugging in mac80211 less useful than it should
be right now:
 * a lot of messages should be pr_info, not pr_debug
 * wholesale use of pr_debug makes it require *both*
   Kconfig and dynamic configuration
 * there are still a lot of ifdefs
 * the style is very inconsistent, sometimes the
   sdata->name is printed in front

Clean up everything, introducing new macros and
separating out the station MLME debugging into
a new Kconfig symbol.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 41 insertions, 31 deletions

diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index da07f01cfe4d..5cc1bf7d8033 100644
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -184,8 +184,8 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
 
         spin_unlock_bh(&sta->lock);
 
-        ht_vdbg("Tx BA session stop requested for %pM tid %u\n",
-                sta->sta.addr, tid);
+        ht_dbg(sta->sdata, "Tx BA session stop requested for %pM tid %u\n",
+               sta->sta.addr, tid);
 
         del_timer_sync(&tid_tx->addba_resp_timer);
         del_timer_sync(&tid_tx->session_timer);
@@ -251,12 +251,13 @@ static void sta_addba_resp_timer_expired(unsigned long data)
         if (!tid_tx ||
             test_bit(HT_AGG_STATE_RESPONSE_RECEIVED, &tid_tx->state)) {
                 rcu_read_unlock();
-                ht_vdbg("timer expired on tid %d but we are not (or no longer) expecting addBA response there\n",
-                        tid);
+                ht_dbg(sta->sdata,
+                       "timer expired on tid %d but we are not (or no longer) expecting addBA response there\n",
+                       tid);
                 return;
         }
 
-        ht_vdbg("addBA response timer expired on tid %d\n", tid);
+        ht_dbg(sta->sdata, "addBA response timer expired on tid %d\n", tid);
 
         ieee80211_stop_tx_ba_session(&sta->sta, tid);
         rcu_read_unlock();
@@ -316,8 +317,9 @@ ieee80211_agg_splice_packets(struct ieee80211_sub_if_data *sdata,
 
         ieee80211_stop_queue_agg(sdata, tid);
 
-        if (WARN(!tid_tx, "TID %d gone but expected when splicing aggregates"
-                          " from the pending queue\n", tid))
+        if (WARN(!tid_tx,
+                 "TID %d gone but expected when splicing aggregates from the pending queue\n",
+                 tid))
                 return;
 
         if (!skb_queue_empty(&tid_tx->pending)) {
@@ -365,7 +367,8 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
         ret = drv_ampdu_action(local, sdata, IEEE80211_AMPDU_TX_START,
                                &sta->sta, tid, &start_seq_num, 0);
         if (ret) {
-                ht_vdbg("BA request denied - HW unavailable for tid %d\n", tid);
+                ht_dbg(sdata,
+                       "BA request denied - HW unavailable for tid %d\n", tid);
                 spin_lock_bh(&sta->lock);
                 ieee80211_agg_splice_packets(sdata, tid_tx, tid);
                 ieee80211_assign_tid_tx(sta, tid, NULL);
@@ -378,7 +381,7 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
 
         /* activate the timer for the recipient's addBA response */
         mod_timer(&tid_tx->addba_resp_timer, jiffies + ADDBA_RESP_INTERVAL);
-        ht_vdbg("activated addBA response timer on tid %d\n", tid);
+        ht_dbg(sdata, "activated addBA response timer on tid %d\n", tid);
 
         spin_lock_bh(&sta->lock);
         sta->ampdu_mlme.last_addba_req_time[tid] = jiffies;
@@ -425,7 +428,7 @@ static void sta_tx_agg_session_timer_expired(unsigned long data)
 
         rcu_read_unlock();
 
-        ht_vdbg("tx session timer expired on tid %d\n", (u16)*ptid);
+        ht_dbg(sta->sdata, "tx session timer expired on tid %d\n", (u16)*ptid);
 
         ieee80211_stop_tx_ba_session(&sta->sta, *ptid);
 }
@@ -449,8 +452,8 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
             (local->hw.flags & IEEE80211_HW_TX_AMPDU_SETUP_IN_HW))
                 return -EINVAL;
 
-        ht_vdbg("Open BA session requested for %pM tid %u\n",
-                pubsta->addr, tid);
+        ht_dbg(sdata, "Open BA session requested for %pM tid %u\n",
+               pubsta->addr, tid);
 
         if (sdata->vif.type != NL80211_IFTYPE_STATION &&
             sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
@@ -460,7 +463,8 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
                 return -EINVAL;
 
         if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {
-                ht_vdbg("BA sessions blocked - Denying BA session request\n");
+                ht_dbg(sdata,
+                       "BA sessions blocked - Denying BA session request\n");
                 return -EINVAL;
         }
 
@@ -478,8 +482,9 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
          */
         if (sta->sdata->vif.type == NL80211_IFTYPE_ADHOC &&
             !sta->sta.ht_cap.ht_supported) {
-                ht_vdbg("BA request denied - IBSS STA %pM does not advertise HT support\n",
-                        pubsta->addr);
+                ht_dbg(sdata,
+                       "BA request denied - IBSS STA %pM does not advertise HT support\n",
+                       pubsta->addr);
                 return -EINVAL;
         }
 
@@ -499,8 +504,9 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
         if (sta->ampdu_mlme.addba_req_num[tid] > HT_AGG_BURST_RETRIES &&
             time_before(jiffies, sta->ampdu_mlme.last_addba_req_time[tid] +
                         HT_AGG_RETRIES_PERIOD)) {
-                ht_vdbg("BA request denied - waiting a grace period after %d failed requests on tid %u\n",
-                        sta->ampdu_mlme.addba_req_num[tid], tid);
+                ht_dbg(sdata,
+                       "BA request denied - waiting a grace period after %d failed requests on tid %u\n",
+                       sta->ampdu_mlme.addba_req_num[tid], tid);
                 ret = -EBUSY;
                 goto err_unlock_sta;
         }
@@ -508,8 +514,9 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
         tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
         /* check if the TID is not in aggregation flow already */
         if (tid_tx || sta->ampdu_mlme.tid_start_tx[tid]) {
-                ht_vdbg("BA request denied - session is not idle on tid %u\n",
-                        tid);
+                ht_dbg(sdata,
+                       "BA request denied - session is not idle on tid %u\n",
+                       tid);
                 ret = -EAGAIN;
                 goto err_unlock_sta;
         }
@@ -564,7 +571,7 @@ static void ieee80211_agg_tx_operational(struct ieee80211_local *local,
 
         tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
 
-        ht_vdbg("Aggregation is on for tid %d\n", tid);
+        ht_dbg(sta->sdata, "Aggregation is on for tid %d\n", tid);
 
         drv_ampdu_action(local, sta->sdata,
                          IEEE80211_AMPDU_TX_OPERATIONAL,
@@ -598,7 +605,8 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid)
         trace_api_start_tx_ba_cb(sdata, ra, tid);
 
         if (tid >= STA_TID_NUM) {
-                ht_vdbg("Bad TID value: tid = %d (>= %d)\n", tid, STA_TID_NUM);
+                ht_dbg(sdata, "Bad TID value: tid = %d (>= %d)\n",
+                       tid, STA_TID_NUM);
                 return;
         }
 
@@ -606,7 +614,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid)
         sta = sta_info_get_bss(sdata, ra);
         if (!sta) {
                 mutex_unlock(&local->sta_mtx);
-                ht_vdbg("Could not find station: %pM\n", ra);
+                ht_dbg(sdata, "Could not find station: %pM\n", ra);
                 return;
         }
 
@@ -614,7 +622,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid)
         tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
 
         if (WARN_ON(!tid_tx)) {
-                ht_vdbg("addBA was not requested!\n");
+                ht_dbg(sdata, "addBA was not requested!\n");
                 goto unlock;
         }
 
@@ -714,17 +722,18 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid)
         trace_api_stop_tx_ba_cb(sdata, ra, tid);
 
         if (tid >= STA_TID_NUM) {
-                ht_vdbg("Bad TID value: tid = %d (>= %d)\n", tid, STA_TID_NUM);
+                ht_dbg(sdata, "Bad TID value: tid = %d (>= %d)\n",
+                       tid, STA_TID_NUM);
                 return;
         }
 
-        ht_vdbg("Stopping Tx BA session for %pM tid %d\n", ra, tid);
+        ht_dbg(sdata, "Stopping Tx BA session for %pM tid %d\n", ra, tid);
 
         mutex_lock(&local->sta_mtx);
 
         sta = sta_info_get_bss(sdata, ra);
         if (!sta) {
-                ht_vdbg("Could not find station: %pM\n", ra);
+                ht_dbg(sdata, "Could not find station: %pM\n", ra);
                 goto unlock;
         }
 
@@ -733,7 +742,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid)
         tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
 
         if (!tid_tx || !test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {
-                ht_vdbg("unexpected callback to A-MPDU stop\n");
+                ht_dbg(sdata, "unexpected callback to A-MPDU stop\n");
                 goto unlock_sta;
         }
 
@@ -809,13 +818,13 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,
                 goto out;
 
         if (mgmt->u.action.u.addba_resp.dialog_token != tid_tx->dialog_token) {
-                ht_vdbg("wrong addBA response token, tid %d\n", tid);
+                ht_dbg(sta->sdata, "wrong addBA response token, tid %d\n", tid);
                 goto out;
         }
 
         del_timer_sync(&tid_tx->addba_resp_timer);
 
-        ht_vdbg("switched off addBA timer for tid %d\n", tid);
+        ht_dbg(sta->sdata, "switched off addBA timer for tid %d\n", tid);
 
         /*
          * addba_resp_timer may have fired before we got here, and
@@ -824,8 +833,9 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,
          */
         if (test_bit(HT_AGG_STATE_WANT_STOP, &tid_tx->state) ||
             test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {
-                ht_vdbg("got addBA resp for tid %d but we already gave up\n",
-                        tid);
+                ht_dbg(sta->sdata,
+                       "got addBA resp for tid %d but we already gave up\n",
+                       tid);
                 goto out;
         }