Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[uclinux-h8/linux.git] / net / wireless / lib80211_crypt_ccmp.c

diff --git a/net/wireless/lib80211_crypt_ccmp.c b/net/wireless/lib80211_crypt_ccmp.c
index dacb3b4..dc0e59e 100644 (file)
--- a/net/wireless/lib80211_crypt_ccmp.c
+++ b/net/wireless/lib80211_crypt_ccmp.c
@@ -77,8 +77,6 @@ static void *lib80211_ccmp_init(int key_idx)
 
        priv->tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
        if (IS_ERR(priv->tfm)) {
-               printk(KERN_DEBUG "lib80211_crypt_ccmp: could not allocate "
-                      "crypto API aes\n");
                priv->tfm = NULL;
                goto fail;
        }
@@ -306,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;
        }
@@ -320,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;
        }
 
@@ -338,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;
@@ -372,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;
        }
@@ -443,24 +430,23 @@ static int lib80211_ccmp_get_key(void *key, int len, u8 * seq, void *priv)
        return CCMP_TK_LEN;
 }
 
-static char *lib80211_ccmp_print_stats(char *p, void *priv)
+static void lib80211_ccmp_print_stats(struct seq_file *m, void *priv)
 {
        struct lib80211_ccmp_data *ccmp = priv;
 
-       p += sprintf(p, "key[%d] alg=CCMP key_set=%d "
-                    "tx_pn=%02x%02x%02x%02x%02x%02x "
-                    "rx_pn=%02x%02x%02x%02x%02x%02x "
-                    "format_errors=%d replays=%d decrypt_errors=%d\n",
-                    ccmp->key_idx, ccmp->key_set,
-                    ccmp->tx_pn[0], ccmp->tx_pn[1], ccmp->tx_pn[2],
-                    ccmp->tx_pn[3], ccmp->tx_pn[4], ccmp->tx_pn[5],
-                    ccmp->rx_pn[0], ccmp->rx_pn[1], ccmp->rx_pn[2],
-                    ccmp->rx_pn[3], ccmp->rx_pn[4], ccmp->rx_pn[5],
-                    ccmp->dot11RSNAStatsCCMPFormatErrors,
-                    ccmp->dot11RSNAStatsCCMPReplays,
-                    ccmp->dot11RSNAStatsCCMPDecryptErrors);
-
-       return p;
+       seq_printf(m,
+                  "key[%d] alg=CCMP key_set=%d "
+                  "tx_pn=%02x%02x%02x%02x%02x%02x "
+                  "rx_pn=%02x%02x%02x%02x%02x%02x "
+                  "format_errors=%d replays=%d decrypt_errors=%d\n",
+                  ccmp->key_idx, ccmp->key_set,
+                  ccmp->tx_pn[0], ccmp->tx_pn[1], ccmp->tx_pn[2],
+                  ccmp->tx_pn[3], ccmp->tx_pn[4], ccmp->tx_pn[5],
+                  ccmp->rx_pn[0], ccmp->rx_pn[1], ccmp->rx_pn[2],
+                  ccmp->rx_pn[3], ccmp->rx_pn[4], ccmp->rx_pn[5],
+                  ccmp->dot11RSNAStatsCCMPFormatErrors,
+                  ccmp->dot11RSNAStatsCCMPReplays,
+                  ccmp->dot11RSNAStatsCCMPDecryptErrors);
 }
 
 static struct lib80211_crypto_ops lib80211_crypt_ccmp = {