Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e77c752f authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Remove RTLLIB_DEBUG_(FRAG|EAP|DROP|STATE|TX|RX)() 



Use netdev_dbg() instead.

Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 521a9cbd

drivers/staging/rtl8192e/rtllib.h

+0 −6
Original line number Diff line number Diff line
@@ -703,13 +703,7 @@ do { \ 
#define RTLLIB_DL_ERR	   (1<<31)

#define RTLLIB_DEBUG_INFO(f, a...)   RTLLIB_DEBUG(RTLLIB_DL_INFO, f, ## a)



#define RTLLIB_DEBUG_STATE(f, a...)  RTLLIB_DEBUG(RTLLIB_DL_STATE, f, ## a)

#define RTLLIB_DEBUG_MGMT(f, a...)  RTLLIB_DEBUG(RTLLIB_DL_MGMT, f, ## a)

#define RTLLIB_DEBUG_FRAG(f, a...)  RTLLIB_DEBUG(RTLLIB_DL_FRAG, f, ## a)

#define RTLLIB_DEBUG_EAP(f, a...)  RTLLIB_DEBUG(RTLLIB_DL_EAP, f, ## a)

#define RTLLIB_DEBUG_DROP(f, a...)  RTLLIB_DEBUG(RTLLIB_DL_DROP, f, ## a)

#define RTLLIB_DEBUG_TX(f, a...)  RTLLIB_DEBUG(RTLLIB_DL_TX, f, ## a)

#define RTLLIB_DEBUG_RX(f, a...)  RTLLIB_DEBUG(RTLLIB_DL_RX, f, ## a)

#define RTLLIB_DEBUG_QOS(f, a...)  RTLLIB_DEBUG(RTLLIB_DL_QOS, f, ## a)



#ifndef ETH_P_PAE

drivers/staging/rtl8192e/rtllib_rx.c

+32 −26
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ rtllib_frag_cache_find(struct rtllib_device *ieee, unsigned int seq, 
		entry = &ieee->frag_cache[tid][i];

		if (entry->skb != NULL &&

		    time_after(jiffies, entry->first_frag_time + 2 * HZ)) {

			RTLLIB_DEBUG_FRAG(

			netdev_dbg(ieee->dev,

				   "expiring fragment cache entry seq=%u last_frag=%u\n",

				   entry->seq, entry->last_frag);

			dev_kfree_skb_any(entry->skb);
@@ -187,8 +187,9 @@ static int rtllib_frag_cache_invalidate(struct rtllib_device *ieee, 
					  hdr->addr1);



	if (entry == NULL) {

		RTLLIB_DEBUG_FRAG(

			"could not invalidate fragment cache entry (seq=%u)\n", seq);

		netdev_dbg(ieee->dev,

			   "Couldn't invalidate fragment cache entry (seq=%u)\n",

			   seq);

		return -1;

	}
@@ -305,10 +306,11 @@ rtllib_rx_frame_decrypt(struct rtllib_device *ieee, struct sk_buff *skb, 
	res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv);

	atomic_dec(&crypt->refcnt);

	if (res < 0) {

		RTLLIB_DEBUG_DROP(

			"decryption failed (SA= %pM) res=%d\n", hdr->addr2, res);

		netdev_dbg(ieee->dev, "decryption failed (SA= %pM) res=%d\n",

			   hdr->addr2, res);

		if (res == -2)

			RTLLIB_DEBUG_DROP("Decryption failed ICV mismatch (key %d)\n",

			netdev_dbg(ieee->dev,

				   "Decryption failed ICV mismatch (key %d)\n",

				   skb->data[hdrlen + 3] >> 6);

		ieee->ieee_stats.rx_discards_undecryptable++;

		return -1;
@@ -840,7 +842,8 @@ static u8 parse_subframe(struct rtllib_device *ieee, struct sk_buff *skb, 
		sub_skb->dev = ieee->dev;

		rxb->subframes[rxb->nr_subframes++] = sub_skb;

		if (rxb->nr_subframes >= MAX_SUBFRAME_COUNT) {

			RTLLIB_DEBUG_RX("ParseSubframe(): Too many Subframes! Packets dropped!\n");

			netdev_dbg(ieee->dev,

				   "ParseSubframe(): Too many Subframes! Packets dropped!\n");

			break;

		}

		skb_pull(skb, nSubframe_Length);
@@ -991,7 +994,7 @@ static int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, 
		    stype != RTLLIB_STYPE_DATA_CFACKPOLL &&

		    stype != RTLLIB_STYPE_QOS_DATA) {

			if (stype != RTLLIB_STYPE_NULLFUNC)

				RTLLIB_DEBUG_DROP(

				netdev_dbg(ieee->dev,

					   "RX: dropped data frame with no data (type=0x%02x, subtype=0x%02x)\n",

					   type, stype);

			return -1;
@@ -1037,7 +1040,8 @@ static int rtllib_rx_get_crypt(struct rtllib_device *ieee, struct sk_buff *skb, 
			 * frames silently instead of filling system log with

			 * these reports.

			 */

			RTLLIB_DEBUG_DROP("Decryption failed (not set) (SA= %pM)\n",

			netdev_dbg(ieee->dev,

				   "Decryption failed (not set) (SA= %pM)\n",

				   hdr->addr2);

			ieee->ieee_stats.rx_discards_undecryptable++;

			return -1;
@@ -1077,7 +1081,7 @@ static int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb, 
		int flen;

		struct sk_buff *frag_skb = rtllib_frag_cache_get(ieee, hdr);



		RTLLIB_DEBUG_FRAG("Rx Fragment received (%u)\n", frag);

		netdev_dbg(ieee->dev, "Rx Fragment received (%u)\n", frag);



		if (!frag_skb) {

			RTLLIB_DEBUG(RTLLIB_DL_RX | RTLLIB_DL_FRAG,
@@ -1148,10 +1152,11 @@ static int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb, 
			 */

			struct eapol *eap = (struct eapol *)(skb->data +

				24);

			RTLLIB_DEBUG_EAP("RX: IEEE 802.1X EAPOL frame: %s\n",

			netdev_dbg(ieee->dev,

				   "RX: IEEE 802.1X EAPOL frame: %s\n",

				   eap_get_type(eap->type));

		} else {

			RTLLIB_DEBUG_DROP(

			netdev_dbg(ieee->dev,

				   "encryption configured, but RX frame not encrypted (SA= %pM)\n",

				   hdr->addr2);

			return -1;
@@ -1162,13 +1167,14 @@ static int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb, 
	    rtllib_is_eapol_frame(ieee, skb, hdrlen)) {

			struct eapol *eap = (struct eapol *)(skb->data +

				24);

			RTLLIB_DEBUG_EAP("RX: IEEE 802.1X EAPOL frame: %s\n",

			netdev_dbg(ieee->dev,

				   "RX: IEEE 802.1X EAPOL frame: %s\n",

				   eap_get_type(eap->type));

	}



	if (crypt && !(fc & RTLLIB_FCTL_WEP) && !ieee->open_wep &&

	    !rtllib_is_eapol_frame(ieee, skb, hdrlen)) {

		RTLLIB_DEBUG_DROP(

		netdev_dbg(ieee->dev,

			   "dropped unencrypted RX data frame from %pM (drop_unencrypted=1)\n",

			   hdr->addr2);

		return -1;

drivers/staging/rtl8192e/rtllib_tx.c

+3 −2
Original line number Diff line number Diff line
@@ -670,7 +670,8 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) 
			struct eapol *eap = (struct eapol *)(skb->data +

				sizeof(struct ethhdr) - SNAP_SIZE -

				sizeof(u16));

			RTLLIB_DEBUG_EAP("TX: IEEE 802.11 EAPOL frame: %s\n",

			netdev_dbg(ieee->dev,

				   "TX: IEEE 802.11 EAPOL frame: %s\n",

				   eap_get_type(eap->type));

		}