net: Convert net_ratelimit uses to net_<level>_ratelimited

Standardize the net core ratelimited logging functions.

Coalesce formats, align arguments.
Change a printk then vprintk sequence to use printf extension %pV.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 6 deletions

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)
                          * local net stack and back to the wireless medium
                          */
                         xmit_skb = skb_copy(skb, GFP_ATOMIC);
-                        if (!xmit_skb && net_ratelimit())
-                                printk(KERN_DEBUG "%s: failed to clone "
-                                       "multicast frame\n", dev->name);
+                        if (!xmit_skb)
+                                net_dbg_ratelimited("%s: failed to clone multicast frame\n",
+                                                    dev->name);
                 } else {
                         dsta = sta_info_get(sdata, skb->data);
                         if (dsta) {
@@ -1957,9 +1957,8 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
 
         fwd_skb = skb_copy(skb, GFP_ATOMIC);
         if (!fwd_skb) {
-                if (net_ratelimit())
-                        printk(KERN_DEBUG "%s: failed to clone mesh frame\n",
-                                        sdata->name);
+                net_dbg_ratelimited("%s: failed to clone mesh frame\n",
+                                    sdata->name);
                 goto out;
         }