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>

2 files changed, 27 insertions, 56 deletions

diff --git a/net/wireless/lib80211_crypt_ccmp.c b/net/wireless/lib80211_crypt_ccmp.c
index 755738d26bb4..1526c211db66 100644
--- a/net/wireless/lib80211_crypt_ccmp.c
+++ b/net/wireless/lib80211_crypt_ccmp.c
@@ -304,10 +304,8 @@ static int lib80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         pos = skb->data + hdr_len;
         keyidx = pos[3];
         if (!(keyidx & (1 << 5))) {
-                if (net_ratelimit()) {
-                        printk(KERN_DEBUG "CCMP: received packet without ExtIV"
-                               " flag from %pM\n", hdr->addr2);
-                }
+                net_dbg_ratelimited("CCMP: received packet without ExtIV flag from %pM\n",
+                                    hdr->addr2);
                 key->dot11RSNAStatsCCMPFormatErrors++;
                 return -2;
         }
@@ -318,11 +316,8 @@ static int lib80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
                 return -6;
         }
         if (!key->key_set) {
-                if (net_ratelimit()) {
-                        printk(KERN_DEBUG "CCMP: received packet from %pM"
-                               " with keyid=%d that does not have a configured"
-                               " key\n", hdr->addr2, keyidx);
-                }
+                net_dbg_ratelimited("CCMP: received packet from %pM with keyid=%d that does not have a configured key\n",
+                                    hdr->addr2, keyidx);
                 return -3;
         }
 
@@ -336,15 +331,11 @@ static int lib80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
 
         if (ccmp_replay_check(pn, key->rx_pn)) {
 #ifdef CONFIG_LIB80211_DEBUG
-                if (net_ratelimit()) {
-                        printk(KERN_DEBUG "CCMP: replay detected: STA=%pM "
-                                 "previous PN %02x%02x%02x%02x%02x%02x "
-                                 "received PN %02x%02x%02x%02x%02x%02x\n",
-                                 hdr->addr2,
-                                 key->rx_pn[0], key->rx_pn[1], key->rx_pn[2],
-                                 key->rx_pn[3], key->rx_pn[4], key->rx_pn[5],
-                                 pn[0], pn[1], pn[2], pn[3], pn[4], pn[5]);
-                }
+                net_dbg_ratelimited("CCMP: replay detected: STA=%pM previous PN %02x%02x%02x%02x%02x%02x received PN %02x%02x%02x%02x%02x%02x\n",
+                                    hdr->addr2,
+                                    key->rx_pn[0], key->rx_pn[1], key->rx_pn[2],
+                                    key->rx_pn[3], key->rx_pn[4], key->rx_pn[5],
+                                    pn[0], pn[1], pn[2], pn[3], pn[4], pn[5]);
 #endif
                 key->dot11RSNAStatsCCMPReplays++;
                 return -4;
@@ -370,10 +361,8 @@ static int lib80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         }
 
         if (memcmp(mic, a, CCMP_MIC_LEN) != 0) {
-                if (net_ratelimit()) {
-                        printk(KERN_DEBUG "CCMP: decrypt failed: STA="
-                               "%pM\n", hdr->addr2);
-                }
+                net_dbg_ratelimited("CCMP: decrypt failed: STA=%pM\n",
+                                    hdr->addr2);
                 key->dot11RSNAStatsCCMPDecryptErrors++;
                 return -5;
         }
diff --git a/net/wireless/lib80211_crypt_tkip.c b/net/wireless/lib80211_crypt_tkip.c
index 38734846c19e..d475cfc8568f 100644
--- a/net/wireless/lib80211_crypt_tkip.c
+++ b/net/wireless/lib80211_crypt_tkip.c
@@ -360,12 +360,9 @@ static int lib80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
         struct scatterlist sg;
 
         if (tkey->flags & IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) {
-                if (net_ratelimit()) {
-                        struct ieee80211_hdr *hdr =
-                            (struct ieee80211_hdr *)skb->data;
-                        printk(KERN_DEBUG ": TKIP countermeasures: dropped "
-                               "TX packet to %pM\n", hdr->addr1);
-                }
+                struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+                net_dbg_ratelimited("TKIP countermeasures: dropped TX packet to %pM\n",
+                                    hdr->addr1);
                 return -1;
         }
 
@@ -420,10 +417,8 @@ static int lib80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         hdr = (struct ieee80211_hdr *)skb->data;
 
         if (tkey->flags & IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) {
-                if (net_ratelimit()) {
-                        printk(KERN_DEBUG ": TKIP countermeasures: dropped "
-                               "received packet from %pM\n", hdr->addr2);
-                }
+                net_dbg_ratelimited("TKIP countermeasures: dropped received packet from %pM\n",
+                                    hdr->addr2);
                 return -1;
         }
 
@@ -433,10 +428,8 @@ static int lib80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         pos = skb->data + hdr_len;
         keyidx = pos[3];
         if (!(keyidx & (1 << 5))) {
-                if (net_ratelimit()) {
-                        printk(KERN_DEBUG "TKIP: received packet without ExtIV"
-                               " flag from %pM\n", hdr->addr2);
-                }
+                net_dbg_ratelimited("TKIP: received packet without ExtIV flag from %pM\n",
+                                    hdr->addr2);
                 return -2;
         }
         keyidx >>= 6;
@@ -446,11 +439,8 @@ static int lib80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
                 return -6;
         }
         if (!tkey->key_set) {
-                if (net_ratelimit()) {
-                        printk(KERN_DEBUG "TKIP: received packet from %pM"
-                               " with keyid=%d that does not have a configured"
-                               " key\n", hdr->addr2, keyidx);
-                }
+                net_dbg_ratelimited("TKIP: received packet from %pM with keyid=%d that does not have a configured key\n",
+                                    hdr->addr2, keyidx);
                 return -3;
         }
         iv16 = (pos[0] << 8) | pos[2];
@@ -459,12 +449,9 @@ static int lib80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
 
         if (tkip_replay_check(iv32, iv16, tkey->rx_iv32, tkey->rx_iv16)) {
 #ifdef CONFIG_LIB80211_DEBUG
-                if (net_ratelimit()) {
-                        printk(KERN_DEBUG "TKIP: replay detected: STA=%pM"
-                               " previous TSC %08x%04x received TSC "
-                               "%08x%04x\n", hdr->addr2,
-                               tkey->rx_iv32, tkey->rx_iv16, iv32, iv16);
-                }
+                net_dbg_ratelimited("TKIP: replay detected: STA=%pM previous TSC %08x%04x received TSC %08x%04x\n",
+                                    hdr->addr2, tkey->rx_iv32, tkey->rx_iv16,
+                                    iv32, iv16);
 #endif
                 tkey->dot11RSNAStatsTKIPReplays++;
                 return -4;
@@ -481,11 +468,8 @@ static int lib80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         crypto_blkcipher_setkey(tkey->rx_tfm_arc4, rc4key, 16);
         sg_init_one(&sg, pos, plen + 4);
         if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4)) {
-                if (net_ratelimit()) {
-                        printk(KERN_DEBUG ": TKIP: failed to decrypt "
-                               "received packet from %pM\n",
-                               hdr->addr2);
-                }
+                net_dbg_ratelimited("TKIP: failed to decrypt received packet from %pM\n",
+                                    hdr->addr2);
                 return -7;
         }
 
@@ -501,10 +485,8 @@ static int lib80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
                         tkey->rx_phase1_done = 0;
                 }
 #ifdef CONFIG_LIB80211_DEBUG
-                if (net_ratelimit()) {
-                        printk(KERN_DEBUG "TKIP: ICV error detected: STA="
-                               "%pM\n", hdr->addr2);
-                }
+                net_dbg_ratelimited("TKIP: ICV error detected: STA=%pM\n",
+                                    hdr->addr2);
 #endif
                 tkey->dot11RSNAStatsTKIPICVErrors++;
                 return -5;