1 files changed, 17 insertions, 27 deletions

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 77dcf2f89d42..06fa75ceb025 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -169,9 +169,7 @@ void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
         if (sta->rate_ctrl)
                 rate_control_free_sta(sta);
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(local->hw.wiphy, "Destroyed STA %pM\n", sta->sta.addr);
-#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+        sta_dbg(sta->sdata, "Destroyed STA %pM\n", sta->sta.addr);
 
         kfree(sta);
 }
@@ -278,9 +276,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
         for (i = 0; i < NUM_RX_DATA_QUEUES; i++)
                 sta->last_seq_ctrl[i] = cpu_to_le16(USHRT_MAX);
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(local->hw.wiphy, "Allocated STA %pM\n", sta->sta.addr);
-#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+        sta_dbg(sdata, "Allocated STA %pM\n", sta->sta.addr);
 
 #ifdef CONFIG_MAC80211_MESH
         sta->plink_state = NL80211_PLINK_LISTEN;
@@ -333,8 +329,9 @@ static int sta_info_insert_drv_state(struct ieee80211_local *local,
         }
 
         if (sdata->vif.type == NL80211_IFTYPE_ADHOC) {
-                pr_debug("%s: failed to move IBSS STA %pM to state %d (%d) - keeping it anyway\n",
-                         sdata->name, sta->sta.addr, state + 1, err);
+                sdata_info(sdata,
+                           "failed to move IBSS STA %pM to state %d (%d) - keeping it anyway\n",
+                           sta->sta.addr, state + 1, err);
                 err = 0;
         }
 
@@ -389,9 +386,7 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU)
         sinfo.generation = local->sta_generation;
         cfg80211_new_sta(sdata->dev, sta->sta.addr, &sinfo, GFP_KERNEL);
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(local->hw.wiphy, "Inserted STA %pM\n", sta->sta.addr);
-#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+        sta_dbg(sdata, "Inserted STA %pM\n", sta->sta.addr);
 
         /* move reference to rcu-protected */
         rcu_read_lock();
@@ -617,9 +612,8 @@ static bool sta_info_cleanup_expire_buffered_ac(struct ieee80211_local *local,
                         break;
 
                 local->total_ps_buffered--;
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-                pr_debug("Buffered frame expired (STA %pM)\n", sta->sta.addr);
-#endif
+                ps_dbg(sta->sdata, "Buffered frame expired (STA %pM)\n",
+                       sta->sta.addr);
                 dev_kfree_skb(skb);
         }
 
@@ -745,9 +739,8 @@ int __must_check __sta_info_destroy(struct sta_info *sta)
                 mesh_accept_plinks_update(sdata);
 #endif
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(local->hw.wiphy, "Removed STA %pM\n", sta->sta.addr);
-#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+        sta_dbg(sdata, "Removed STA %pM\n", sta->sta.addr);
+
         cancel_work_sync(&sta->drv_unblock_wk);
 
         cfg80211_del_sta(sdata->dev, sta->sta.addr, GFP_KERNEL);
@@ -887,8 +880,8 @@ void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata,
                         continue;
 
                 if (time_after(jiffies, sta->last_rx + exp_time)) {
-                        ibss_vdbg("%s: expiring inactive STA %pM\n",
-                                  sdata->name, sta->sta.addr);
+                        ibss_dbg(sdata, "expiring inactive STA %pM\n",
+                                 sta->sta.addr);
                         WARN_ON(__sta_info_destroy(sta));
                 }
         }
@@ -986,10 +979,9 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
 
         sta_info_recalc_tim(sta);
 
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-        pr_debug("%s: STA %pM aid %d sending %d filtered/%d PS frames since STA not sleeping anymore\n",
-                 sdata->name, sta->sta.addr, sta->sta.aid, filtered, buffered);
-#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
+        ps_dbg(sdata,
+               "STA %pM aid %d sending %d filtered/%d PS frames since STA not sleeping anymore\n",
+               sta->sta.addr, sta->sta.aid, filtered, buffered);
 }
 
 static void ieee80211_send_null_response(struct ieee80211_sub_if_data *sdata,
@@ -1379,10 +1371,8 @@ int sta_info_move_state(struct sta_info *sta,
                 return -EINVAL;
         }
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        pr_debug("%s: moving STA %pM to state %d\n",
-                 sta->sdata->name, sta->sta.addr, new_state);
-#endif
+        sta_dbg(sta->sdata, "moving STA %pM to state %d\n",
+                sta->sta.addr, new_state);
 
         /*
          * notify the driver before the actual changes so it can