From: YAMANE Toshiaki <yamanetoshi@gmail.com>
To: Greg Kroah-Hartman <greg@kroah.com>
Cc: linux-kernel@vger.kernel.org, YAMANE Toshiaki <yamanetoshi@gmail.com>
Subject: [PATCH 11/16] staging/rtl8187se: Use pr_ printks in ieee80211/ieee80211_crypt_ccmp.c
Date: Tue, 20 Nov 2012 21:12:52 +0900 [thread overview]
Message-ID: <1353413572-24786-1-git-send-email-yamanetoshi@gmail.com> (raw)
In-Reply-To: <1353413395-24444-1-git-send-email-yamanetoshi@gmail.com>
The following warnings fixed.
- WARNING: Prefer netdev_dbg(netdev, ... then dev_dbg(dev, ... then pr_debug(... to printk(KERN_DEBUG ...
and add pr_fmt.
Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
---
.../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 26 +++++++++-----------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c
index 5465b09..40217b7 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c
@@ -9,6 +9,8 @@
* more details.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
//#include <linux/config.h>
#include <linux/module.h>
#include <linux/init.h>
@@ -75,8 +77,7 @@ static void *ieee80211_ccmp_init(int key_idx)
priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
if (IS_ERR(priv->tfm)) {
- printk(KERN_DEBUG "ieee80211_crypt_ccmp: could not allocate "
- "crypto API aes\n");
+ pr_debug("could not allocate crypto API aes\n");
priv->tfm = NULL;
goto fail;
}
@@ -282,23 +283,22 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
keyidx = pos[3];
if (!(keyidx & (1 << 5))) {
if (net_ratelimit()) {
- printk(KERN_DEBUG "CCMP: received packet without ExtIV"
- " flag from %pM\n", hdr->addr2);
+ pr_debug("received packet without ExtIV flag from %pM\n",
+ hdr->addr2);
}
key->dot11RSNAStatsCCMPFormatErrors++;
return -2;
}
keyidx >>= 6;
if (key->key_idx != keyidx) {
- printk(KERN_DEBUG "CCMP: RX tkey->key_idx=%d frame "
- "keyidx=%d priv=%p\n", key->key_idx, keyidx, priv);
+ pr_debug("RX tkey->key_idx=%d frame keyidx=%d priv=%p\n",
+ key->key_idx, keyidx, 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);
+ pr_debug("received packet from %pM with keyid=%d that does not have a configured key\n",
+ hdr->addr2, keyidx);
}
return -3;
}
@@ -313,9 +313,8 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
if (memcmp(pn, key->rx_pn, CCMP_PN_LEN) <= 0) {
if (net_ratelimit()) {
- printk(KERN_DEBUG "CCMP: replay detected: STA=%pM"
- " previous PN %pm received PN %pm\n",
- hdr->addr2, key->rx_pn, pn);
+ pr_debug("replay detected: STA=%pM previous PN %pm received PN %pm\n",
+ hdr->addr2, key->rx_pn, pn);
}
key->dot11RSNAStatsCCMPReplays++;
return -4;
@@ -342,8 +341,7 @@ static int ieee80211_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);
+ pr_debug("decrypt failed: STA=%pM\n", hdr->addr2);
}
key->dot11RSNAStatsCCMPDecryptErrors++;
return -5;
--
1.7.9.5
next prev parent reply other threads:[~2012-11-20 12:12 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-20 12:09 [PATCH 01/16] staging/rtl8187se: Fix spacing coding style in r8180_dm.h YAMANE Toshiaki
2012-11-20 12:10 ` [PATCH 02/16] staging/rtl8187se: Fix include file issue in ieee80211/ieee80211_crypt.c YAMANE Toshiaki
2012-11-20 12:10 ` [PATCH 03/16] staging/rtl8187se: Use pr_ printks " YAMANE Toshiaki
2012-11-20 12:11 ` [PATCH 04/16] staging/rtl8187se: Fix spacing coding style " YAMANE Toshiaki
2012-11-20 12:11 ` [PATCH 05/16] staging/rtl8187se: Fix spacing coding style in ieee80211/ieee80211_crypt.h YAMANE Toshiaki
2012-11-20 12:11 ` [PATCH 06/16] staging/rtl8187se: Fix include file issue in ieee80211/ieee80211_module.c YAMANE Toshiaki
2012-11-20 12:11 ` [PATCH 07/16] staging/rtl8187se: Use netdev_ printks " YAMANE Toshiaki
2012-11-20 12:12 ` [PATCH 08/16] staging/rtl8187se: Fix spacing coding style " YAMANE Toshiaki
2012-11-20 12:12 ` [PATCH 09/16] staging/rtl8187se: Fix include file issue in ieee80211/ieee80211_crypt_ccmp.c YAMANE Toshiaki
2012-11-20 12:12 ` [PATCH 10/16] staging/rtl8187se: Fix spacing coding style " YAMANE Toshiaki
2012-11-20 12:12 ` YAMANE Toshiaki [this message]
2012-11-20 12:13 ` [PATCH 12/16] " YAMANE Toshiaki
2012-11-20 12:13 ` [PATCH 13/16] staging/rtl8187se: Fix include file issue in ieee80211/ieee80211_crypt_wep.c YAMANE Toshiaki
2012-11-20 12:13 ` [PATCH 14/16] staging/rtl8187se: Fix spacing coding style " YAMANE Toshiaki
2012-11-20 12:13 ` [PATCH 15/16] staging/rtl8187se: Use pr_ printks " YAMANE Toshiaki
2012-11-20 12:13 ` [PATCH 16/16] staging/rtl8187se: Fix spacing coding style " YAMANE Toshiaki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1353413572-24786-1-git-send-email-yamanetoshi@gmail.com \
--to=yamanetoshi@gmail.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®