Commit 11bc6596 authored by Arushi Singhal's avatar Arushi Singhal Committed by Greg Kroah-Hartman
Browse files

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: default avatarArushi Singhal <arushisinghal19971997@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c674f4aa

drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c

+11 −11
Original line number Diff line number Diff line
@@ -73,7 +73,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("ieee80211_crypt_ccmp: could not allocate crypto API aes\n");

		priv->tfm = NULL;

		goto fail;

	}
@@ -276,7 +276,7 @@ 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",

			netdev_dbg(skb->dev, "CCMP: received packet without ExtIV flag from %pM\n",

				   hdr->addr2);

		}

		key->dot11RSNAStatsCCMPFormatErrors++;
@@ -284,13 +284,13 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	}

	keyidx >>= 6;

	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);

		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",

			netdev_dbg(skb->dev, "CCMP: received packet from %pM with keyid=%d that does not have a configured key\n",

				   hdr->addr2, keyidx);

		}

		return -3;
@@ -306,7 +306,7 @@ 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",

			netdev_dbg(skb->dev, "CCMP: replay detected: STA=%pM previous PN %pm received PN %pm\n",

				   hdr->addr2, key->rx_pn, pn);

		}

		key->dot11RSNAStatsCCMPReplays++;
@@ -341,7 +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",

				netdev_dbg(skb->dev, "CCMP: decrypt failed: STA=%pM\n",

					   hdr->addr2);

			}

			key->dot11RSNAStatsCCMPDecryptErrors++;

CRA Git | Maintained and supported by SUSTech CRA and CCSE