1 files changed, 43 insertions, 46 deletions

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index ff46ff424941..5746d62faba1 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -261,11 +261,7 @@ static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta,
 
         memcpy(addr, sta->sta.addr, ETH_ALEN);
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(sdata->local->hw.wiphy,
-                    "Adding new IBSS station %pM (dev=%s)\n",
-                    addr, sdata->name);
-#endif
+        ibss_dbg(sdata, "Adding new IBSS station %pM\n", addr);
 
         sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
         sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
@@ -280,8 +276,9 @@ static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta,
         if (sta_info_insert_rcu(sta))
                 return sta_info_get(sdata, addr);
         if (auth && !sdata->u.ibss.auth_frame_registrations) {
-                ibss_vdbg("TX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=1)\n",
-                          sdata->vif.addr, sdata->u.ibss.bssid, addr);
+                ibss_dbg(sdata,
+                         "TX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=1)\n",
+                         sdata->vif.addr, sdata->u.ibss.bssid, addr);
                 ieee80211_send_auth(sdata, 1, WLAN_AUTH_OPEN, NULL, 0,
                                     addr, sdata->u.ibss.bssid, NULL, 0, 0);
         }
@@ -304,7 +301,7 @@ ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata,
          *      allow new one to be added.
          */
         if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
-                net_dbg_ratelimited("%s: No room for a new IBSS STA entry %pM\n",
+                net_info_ratelimited("%s: No room for a new IBSS STA entry %pM\n",
                                     sdata->name, addr);
                 rcu_read_lock();
                 return NULL;
@@ -351,9 +348,9 @@ static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata,
 
         if (auth_alg != WLAN_AUTH_OPEN || auth_transaction != 1)
                 return;
-        ibss_vdbg("%s: RX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=%d)\n",
-                  sdata->name, mgmt->sa, mgmt->da, mgmt->bssid,
-                  auth_transaction);
+        ibss_dbg(sdata,
+                 "RX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=%d)\n",
+                 mgmt->sa, mgmt->da, mgmt->bssid, auth_transaction);
         sta_info_destroy_addr(sdata, mgmt->sa);
         ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa, 0, false);
         rcu_read_unlock();
@@ -416,10 +413,10 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                                         ieee80211_mandatory_rates(local, band);
 
                                 if (sta->sta.supp_rates[band] != prev_rates) {
-                                        ibss_vdbg("%s: updated supp_rates set for %pM based on beacon/probe_resp (0x%x -> 0x%x)\n",
-                                                  sdata->name, sta->sta.addr,
-                                                  prev_rates,
-                                                  sta->sta.supp_rates[band]);
+                                        ibss_dbg(sdata,
+                                                 "updated supp_rates set for %pM based on beacon/probe_resp (0x%x -> 0x%x)\n",
+                                                 sta->sta.addr, prev_rates,
+                                                 sta->sta.supp_rates[band]);
                                         rates_updated = true;
                                 }
                         } else {
@@ -534,16 +531,18 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                 rx_timestamp = drv_get_tsf(local, sdata);
         }
 
-        ibss_vdbg("RX beacon SA=%pM BSSID=%pM TSF=0x%llx BCN=0x%llx diff=%lld @%lu\n",
-                  mgmt->sa, mgmt->bssid,
-                  (unsigned long long)rx_timestamp,
-                  (unsigned long long)beacon_timestamp,
-                  (unsigned long long)(rx_timestamp - beacon_timestamp),
-                  jiffies);
+        ibss_dbg(sdata,
+                 "RX beacon SA=%pM BSSID=%pM TSF=0x%llx BCN=0x%llx diff=%lld @%lu\n",
+                 mgmt->sa, mgmt->bssid,
+                 (unsigned long long)rx_timestamp,
+                 (unsigned long long)beacon_timestamp,
+                 (unsigned long long)(rx_timestamp - beacon_timestamp),
+                 jiffies);
 
         if (beacon_timestamp > rx_timestamp) {
-                ibss_vdbg("%s: beacon TSF higher than local TSF - IBSS merge with BSSID %pM\n",
-                          sdata->name, mgmt->bssid);
+                ibss_dbg(sdata,
+                         "beacon TSF higher than local TSF - IBSS merge with BSSID %pM\n",
+                         mgmt->bssid);
                 ieee80211_sta_join_ibss(sdata, bss);
                 supp_rates = ieee80211_sta_get_rates(local, elems, band, NULL);
                 ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa,
@@ -569,7 +568,7 @@ void ieee80211_ibss_rx_no_sta(struct ieee80211_sub_if_data *sdata,
          *      allow new one to be added.
          */
         if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
-                net_dbg_ratelimited("%s: No room for a new IBSS STA entry %pM\n",
+                net_info_ratelimited("%s: No room for a new IBSS STA entry %pM\n",
                                     sdata->name, addr);
                 return;
         }
@@ -645,8 +644,8 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata)
         if (ifibss->fixed_channel)
                 return;
 
-        pr_debug("%s: No active IBSS STAs - trying to scan for other IBSS networks with same SSID (merge)\n",
-                 sdata->name);
+        sdata_info(sdata,
+                   "No active IBSS STAs - trying to scan for other IBSS networks with same SSID (merge)\n");
 
         ieee80211_request_internal_scan(sdata,
                         ifibss->ssid, ifibss->ssid_len, NULL);
@@ -674,8 +673,7 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
                 bssid[0] |= 0x02;
         }
 
-        pr_debug("%s: Creating new IBSS network, BSSID %pM\n",
-                 sdata->name, bssid);
+        sdata_info(sdata, "Creating new IBSS network, BSSID %pM\n", bssid);
 
         capability = WLAN_CAPABILITY_IBSS;
 
@@ -706,8 +704,7 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
         lockdep_assert_held(&ifibss->mtx);
 
         active_ibss = ieee80211_sta_active_ibss(sdata);
-        ibss_vdbg("%s: sta_find_ibss (active_ibss=%d)\n",
-                  sdata->name, active_ibss);
+        ibss_dbg(sdata, "sta_find_ibss (active_ibss=%d)\n", active_ibss);
 
         if (active_ibss)
                 return;
@@ -730,23 +727,24 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
                 struct ieee80211_bss *bss;
 
                 bss = (void *)cbss->priv;
-                ibss_vdbg("   sta_find_ibss: selected %pM current %pM\n",
-                          cbss->bssid, ifibss->bssid);
-                pr_debug("%s: Selected IBSS BSSID %pM based on configured SSID\n",
-                         sdata->name, cbss->bssid);
+                ibss_dbg(sdata,
+                         "sta_find_ibss: selected %pM current %pM\n",
+                         cbss->bssid, ifibss->bssid);
+                sdata_info(sdata,
+                           "Selected IBSS BSSID %pM based on configured SSID\n",
+                           cbss->bssid);
 
                 ieee80211_sta_join_ibss(sdata, bss);
                 ieee80211_rx_bss_put(local, bss);
                 return;
         }
 
-        ibss_vdbg("   did not try to join ibss\n");
+        ibss_dbg(sdata, "sta_find_ibss: did not try to join ibss\n");
 
         /* Selected IBSS not found in current scan results - try to scan */
         if (time_after(jiffies, ifibss->last_scan_completed +
                                         IEEE80211_SCAN_INTERVAL)) {
-                pr_debug("%s: Trigger new scan to find an IBSS to join\n",
-                         sdata->name);
+                sdata_info(sdata, "Trigger new scan to find an IBSS to join\n");
 
                 ieee80211_request_internal_scan(sdata,
                                 ifibss->ssid, ifibss->ssid_len,
@@ -760,9 +758,8 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
                                 ieee80211_sta_create_ibss(sdata);
                                 return;
                         }
-                        pr_debug("%s: IBSS not allowed on %d MHz\n",
-                                 sdata->name,
-                                 local->hw.conf.channel->center_freq);
+                        sdata_info(sdata, "IBSS not allowed on %d MHz\n",
+                                   local->hw.conf.channel->center_freq);
 
                         /* No IBSS found - decrease scan interval and continue
                          * scanning. */
@@ -797,9 +794,9 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
 
         tx_last_beacon = drv_tx_last_beacon(local);
 
-        ibss_vdbg("%s: RX ProbeReq SA=%pM DA=%pM BSSID=%pM (tx_last_beacon=%d)\n",
-                  sdata->name, mgmt->sa, mgmt->da,
-                  mgmt->bssid, tx_last_beacon);
+        ibss_dbg(sdata,
+                 "RX ProbeReq SA=%pM DA=%pM BSSID=%pM (tx_last_beacon=%d)\n",
+                 mgmt->sa, mgmt->da, mgmt->bssid, tx_last_beacon);
 
         if (!tx_last_beacon && is_multicast_ether_addr(mgmt->da))
                 return;
@@ -812,8 +809,8 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
         pos = mgmt->u.probe_req.variable;
         if (pos[0] != WLAN_EID_SSID ||
             pos + 2 + pos[1] > end) {
-                ibss_vdbg("%s: Invalid SSID IE in ProbeReq from %pM\n",
-                          sdata->name, mgmt->sa);
+                ibss_dbg(sdata, "Invalid SSID IE in ProbeReq from %pM\n",
+                         mgmt->sa);
                 return;
         }
         if (pos[1] != 0 &&
@@ -830,7 +827,7 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
 
         resp = (struct ieee80211_mgmt *) skb->data;
         memcpy(resp->da, mgmt->sa, ETH_ALEN);
-        ibss_vdbg("%s: Sending ProbeResp to %pM\n", sdata->name, resp->da);
+        ibss_dbg(sdata, "Sending ProbeResp to %pM\n", resp->da);
         IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
         ieee80211_tx_skb(sdata, skb);
 }