OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: rtl8192u: Replace printk() with more standardize output format. 

printk() is the raw way to print output and should be avoided.

For drivers with defined "struct device object", dev_*macro() is
prefer and for "struct netdevice object", netdev_*macro() is prefer over
dev_*macro() to standardize the output format within the subsystem.

If no "struct device object" is defined prefer pr_*macro() over printk().

This patch Replace printk having a log level with the appropriate output
format according to the order of preference.

Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arushi Singhal 2018-03-07 16:09:09 +05:30 committed by Greg Kroah-Hartman
parent c674f4aab4
commit 11bc6596aa
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c
View File

@ -73,7 +73,7 @@ static void *ieee80211_ccmp_init(int key_idx)
priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC); priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
if (IS_ERR(priv->tfm)) { if (IS_ERR(priv->tfm)) {
printk(KERN_DEBUG "ieee80211_crypt_ccmp: could not allocate crypto API aes\n"); pr_debug("ieee80211_crypt_ccmp: could not allocate crypto API aes\n");
priv->tfm = NULL; priv->tfm = NULL;
goto fail; goto fail;
} }
@ -276,22 +276,22 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
keyidx = pos[3]; keyidx = pos[3];
if (!(keyidx & (1 << 5))) { if (!(keyidx & (1 << 5))) {
if (net_ratelimit()) { if (net_ratelimit()) {
printk(KERN_DEBUG "CCMP: received packet without ExtIV flag from %pM\n", netdev_dbg(skb->dev, "CCMP: received packet without ExtIV flag from %pM\n",
hdr->addr2); hdr->addr2);
} }
key->dot11RSNAStatsCCMPFormatErrors++; key->dot11RSNAStatsCCMPFormatErrors++;
return -2; return -2;
} }
keyidx >>= 6; keyidx >>= 6;
if (key->key_idx != keyidx) { if (key->key_idx != keyidx) {
printk(KERN_DEBUG "CCMP: RX tkey->key_idx=%d frame keyidx=%d priv=%p\n", netdev_dbg(skb->dev, "CCMP: RX tkey->key_idx=%d frame keyidx=%d priv=%p\n",
key->key_idx, keyidx, priv); key->key_idx, keyidx, priv);
return -6; return -6;
} }
if (!key->key_set) { if (!key->key_set) {
if (net_ratelimit()) { if (net_ratelimit()) {
printk(KERN_DEBUG "CCMP: received packet from %pM with keyid=%d that does not have a configured key\n", netdev_dbg(skb->dev, "CCMP: received packet from %pM with keyid=%d that does not have a configured key\n",
hdr->addr2, keyidx); hdr->addr2, keyidx);
} }
return -3; return -3;
} }
@ -306,8 +306,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 (memcmp(pn, key->rx_pn, CCMP_PN_LEN) <= 0) {
if (net_ratelimit()) { if (net_ratelimit()) {
printk(KERN_DEBUG "CCMP: replay detected: STA=%pM previous PN %pm received PN %pm\n", netdev_dbg(skb->dev, "CCMP: replay detected: STA=%pM previous PN %pm received PN %pm\n",
hdr->addr2, key->rx_pn, pn); hdr->addr2, key->rx_pn, pn);
} }
key->dot11RSNAStatsCCMPReplays++; key->dot11RSNAStatsCCMPReplays++;
return -4; return -4;
@ -341,8 +341,8 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
if (memcmp(mic, a, CCMP_MIC_LEN) != 0) { if (memcmp(mic, a, CCMP_MIC_LEN) != 0) {
if (net_ratelimit()) { if (net_ratelimit()) {
printk(KERN_DEBUG "CCMP: decrypt failed: STA=%pM\n", netdev_dbg(skb->dev, "CCMP: decrypt failed: STA=%pM\n",
hdr->addr2); hdr->addr2);
} }
key->dot11RSNAStatsCCMPDecryptErrors++; key->dot11RSNAStatsCCMPDecryptErrors++;
return -5; return -5;