Merge branch 'wl12xx-next' into for-linville

[firefly-linux-kernel-4.4.55.git] / net / mac80211 / rx.c

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 7bcecf73aafbf9dadb87a2c8a114e3eb92490131..6fd2cb0838c475003c59e7e3eb406f5030596a38 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1137,22 +1137,22 @@ static void ap_sta_ps_start(struct sta_info *sta)
        if (!(local->hw.flags & IEEE80211_HW_AP_LINK_PS))
                drv_sta_notify(local, sdata, STA_NOTIFY_SLEEP, &sta->sta);
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-       printk(KERN_DEBUG "%s: STA %pM aid %d enters power save mode\n",
-              sdata->name, sta->sta.addr, sta->sta.aid);
+       pr_debug("%s: STA %pM aid %d enters power save mode\n",
+                sdata->name, sta->sta.addr, sta->sta.aid);
 #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
 }
 
 static void ap_sta_ps_end(struct sta_info *sta)
 {
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-       printk(KERN_DEBUG "%s: STA %pM aid %d exits power save mode\n",
-              sta->sdata->name, sta->sta.addr, sta->sta.aid);
+       pr_debug("%s: STA %pM aid %d exits power save mode\n",
+                sta->sdata->name, sta->sta.addr, sta->sta.aid);
 #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
 
        if (test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-               printk(KERN_DEBUG "%s: STA %pM aid %d driver-ps-blocked\n",
-                      sta->sdata->name, sta->sta.addr, sta->sta.aid);
+               pr_debug("%s: STA %pM aid %d driver-ps-blocked\n",
+                        sta->sdata->name, sta->sta.addr, sta->sta.aid);
 #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
                return;
        }
@@ -1387,12 +1387,10 @@ ieee80211_reassemble_add(struct ieee80211_sub_if_data *sdata,
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
                struct ieee80211_hdr *hdr =
                        (struct ieee80211_hdr *) entry->skb_list.next->data;
-               printk(KERN_DEBUG "%s: RX reassembly removed oldest "
-                      "fragment entry (idx=%d age=%lu seq=%d last_frag=%d "
-                      "addr1=%pM addr2=%pM\n",
-                      sdata->name, idx,
-                      jiffies - entry->first_frag_time, entry->seq,
-                      entry->last_frag, hdr->addr1, hdr->addr2);
+               pr_debug("%s: RX reassembly removed oldest fragment entry (idx=%d age=%lu seq=%d last_frag=%d addr1=%pM addr2=%pM\n",
+                        sdata->name, idx,
+                        jiffies - entry->first_frag_time, entry->seq,
+                        entry->last_frag, hdr->addr1, hdr->addr2);
 #endif
                __skb_queue_purge(&entry->skb_list);
        }