Commit ea7a10ea authored by Sam Muhammed's avatar Sam Muhammed Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8192u: ieee80211: Use netdev_dbg() for debug messages. 



Replace printk(KERN_DEBUG ...) with netdev_dbg() across the driver.
since netdev_dbg() is preferable and specific for
printing debug messages for network devices.

Signed-off-by: default avatarSam Muhammed <jane.pnx9@gmail.com>
Link: https://lore.kernel.org/r/84dc7e33954509457efce2a35fb293e631845a96.1585233434.git.jane.pnx9@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1165dd73

drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c

+9 −10
Original line number Diff line number Diff line
@@ -388,20 +388,20 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	keyidx = pos[3];

	if (!(keyidx & BIT(5))) {

		if (net_ratelimit()) {

			printk(KERN_DEBUG "TKIP: received packet without ExtIV"

			netdev_dbg(skb->dev, "TKIP: received packet without ExtIV"

			       " flag from %pM\n", hdr->addr2);

		}

		return -2;

	}

	keyidx >>= 6;

	if (tkey->key_idx != keyidx) {

		printk(KERN_DEBUG "TKIP: RX tkey->key_idx=%d frame "

		netdev_dbg(skb->dev, "TKIP: RX tkey->key_idx=%d frame "

		       "keyidx=%d priv=%p\n", tkey->key_idx, keyidx, priv);

		return -6;

	}

	if (!tkey->key_set) {

		if (net_ratelimit()) {

			printk(KERN_DEBUG "TKIP: received packet from %pM"

			netdev_dbg(skb->dev, "TKIP: received packet from %pM"

			       " with keyid=%d that does not have a configured"

			       " key\n", hdr->addr2, keyidx);

		}
@@ -417,7 +417,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
		if (iv32 < tkey->rx_iv32 ||

		(iv32 == tkey->rx_iv32 && iv16 <= tkey->rx_iv16)) {

			if (net_ratelimit()) {

				printk(KERN_DEBUG "TKIP: replay detected: STA=%pM"

				netdev_dbg(skb->dev, "TKIP: replay detected: STA=%pM"

				" previous TSC %08x%04x received TSC "

				"%08x%04x\n", hdr->addr2,

				tkey->rx_iv32, tkey->rx_iv16, iv32, iv16);
@@ -445,7 +445,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
		skcipher_request_zero(req);

		if (err) {

			if (net_ratelimit()) {

				printk(KERN_DEBUG ": TKIP: failed to decrypt "

				netdev_dbg(skb->dev, "TKIP: failed to decrypt "

						"received packet from %pM\n",

						hdr->addr2);

			}
@@ -468,7 +468,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
				tkey->rx_phase1_done = 0;

			}

			if (net_ratelimit()) {

				printk(KERN_DEBUG "TKIP: ICV error detected: STA="

				netdev_dbg(skb->dev, "TKIP: ICV error detected: STA="

				"%pM\n", hdr->addr2);

			}

			tkey->dot11RSNAStatsTKIPICVErrors++;
@@ -559,7 +559,7 @@ static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len, void *pri 
	hdr = (struct rtl_80211_hdr_4addr *)skb->data;



	if (skb_tailroom(skb) < 8 || skb->len < hdr_len) {

		printk(KERN_DEBUG "Invalid packet for Michael MIC add "

		netdev_dbg(skb->dev, "Invalid packet for Michael MIC add "

		       "(tailroom=%d hdr_len=%d skb->len=%d)\n",

		       skb_tailroom(skb), hdr_len, skb->len);

		return -1;
@@ -628,10 +628,9 @@ static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx, 
		struct rtl_80211_hdr_4addr *hdr;

		hdr = (struct rtl_80211_hdr_4addr *)skb->data;



		printk(KERN_DEBUG "%s: Michael MIC verification failed for "

		netdev_dbg(skb->dev, "Michael MIC verification failed for "

		       "MSDU from %pM keyidx=%d\n",

		       skb->dev ? skb->dev->name : "N/A", hdr->addr2,

		       keyidx);

		       hdr->addr2, keyidx);

		if (skb->dev)

			ieee80211_michael_mic_failure(skb->dev, hdr, keyidx);

		tkey->dot11RSNAStatsTKIPLocalMICFailures++;

drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c

+2 −3
Original line number Diff line number Diff line
@@ -180,9 +180,8 @@ int ieee80211_encrypt_fragment( 
			struct rtl_80211_hdr_3addrqos *header;



			header = (struct rtl_80211_hdr_3addrqos *)frag->data;

			printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "

			       "TX packet to %pM\n",

			       ieee->dev->name, header->addr1);

			netdev_dbg(ieee->dev, "TKIP countermeasures: dropped "

			       "TX packet to %pM\n", header->addr1);

		}

		return -1;

	}

drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee, 
	if (ieee->reset_on_keychange &&

	    ieee->iw_mode != IW_MODE_INFRA &&

	    ieee->reset_port && ieee->reset_port(dev)) {

		printk(KERN_DEBUG "%s: reset_port failed\n", dev->name);

		netdev_dbg(ieee->dev, "reset_port failed\n");

		return -EINVAL;

	}

	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE