Commit 0ee9f67c authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8187x: Use %pM for mac address output 



Uncompiled.  Doesn't currently build anyway.

Converted MAC_FMT to %pM
Converted some %02x%02x%02x%02x%02x%02x to %pm
Converted MAC_ARG to direct use
Removed MAC_FMT and MAC_ARG macros

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a5c25241

drivers/staging/rtl8187se/ieee80211/ieee80211.h

+0 −4
Original line number Diff line number Diff line
@@ -161,10 +161,6 @@ do { if (ieee80211_debug_level & (level)) \ 
#define IEEE80211_DEBUG(level, fmt, args...) do {} while (0)

#endif	/* CONFIG_IEEE80211_DEBUG */



#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"

#define MAC_ARG(x) ((u8 *)(x))[0], ((u8 *)(x))[1], ((u8 *)(x))[2], \

		   ((u8 *)(x))[3], ((u8 *)(x))[4], ((u8 *)(x))[5]



/*

 * To use the debug system;

 *

drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c

+9 −12
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	if (!(keyidx & (1 << 5))) {

		if (net_ratelimit()) {

			printk(KERN_DEBUG "CCMP: received packet without ExtIV"

			       " flag from " MAC_FMT "\n", MAC_ARG(hdr->addr2));

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

		}

		key->dot11RSNAStatsCCMPFormatErrors++;

		return -2;
@@ -298,9 +298,9 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	}

	if (!key->key_set) {

		if (net_ratelimit()) {

			printk(KERN_DEBUG "CCMP: received packet from " MAC_FMT

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

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

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

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

		}

		return -3;

	}
@@ -315,11 +315,9 @@ 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=" MAC_FMT

			       " previous PN %02x%02x%02x%02x%02x%02x "

			       "received PN %02x%02x%02x%02x%02x%02x\n",

			       MAC_ARG(hdr->addr2), MAC_ARG(key->rx_pn),

			       MAC_ARG(pn));

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

			       " previous PN %pm received PN %pm\n",

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

		}

		key->dot11RSNAStatsCCMPReplays++;

		return -4;
@@ -347,7 +345,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="

			       MAC_FMT "\n", MAC_ARG(hdr->addr2));

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

		}

		key->dot11RSNAStatsCCMPDecryptErrors++;

		return -5;
@@ -423,11 +421,10 @@ static char * ieee80211_ccmp_print_stats(char *p, void *priv) 
{

	struct ieee80211_ccmp_data *ccmp = priv;

	p += sprintf(p, "key[%d] alg=CCMP key_set=%d "

		     "tx_pn=%02x%02x%02x%02x%02x%02x "

		     "rx_pn=%02x%02x%02x%02x%02x%02x "

		     "tx_pn=%pm rx_pn=%pm "

		     "format_errors=%d replays=%d decrypt_errors=%d\n",

		     ccmp->key_idx, ccmp->key_set,

		     MAC_ARG(ccmp->tx_pn), MAC_ARG(ccmp->rx_pn),

		     ccmp->tx_pn, ccmp->rx_pn,

		     ccmp->dot11RSNAStatsCCMPFormatErrors,

		     ccmp->dot11RSNAStatsCCMPReplays,

		     ccmp->dot11RSNAStatsCCMPDecryptErrors);

drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c

+10 −10
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	if (!(keyidx & (1 << 5))) {

		if (net_ratelimit()) {

			printk(KERN_DEBUG "TKIP: received packet without ExtIV"

			       " flag from " MAC_FMT "\n", MAC_ARG(hdr->addr2));

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

		}

		return -2;

	}
@@ -397,9 +397,9 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	}

	if (!tkey->key_set) {

		if (net_ratelimit()) {

			printk(KERN_DEBUG "TKIP: received packet from " MAC_FMT

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

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

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

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

		}

		return -3;

	}
@@ -410,9 +410,9 @@ 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=" MAC_FMT

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

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

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

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

			       tkey->rx_iv32, tkey->rx_iv16, iv32, iv16);

		}

		tkey->dot11RSNAStatsTKIPReplays++;
@@ -431,8 +431,8 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4)) {

		if (net_ratelimit()) {

			printk(KERN_DEBUG ": TKIP: failed to decrypt "

			       "received packet from " MAC_FMT "\n",

			       MAC_ARG(hdr->addr2));

			       "received packet from %pM\n",

			       hdr->addr2);

		}

		return -7;

	}
@@ -450,7 +450,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
		}

		if (net_ratelimit()) {

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

			       MAC_FMT "\n", MAC_ARG(hdr->addr2));

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

		}

		tkey->dot11RSNAStatsTKIPICVErrors++;

		return -5;
@@ -604,8 +604,8 @@ static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx, 
		struct ieee80211_hdr_4addr *hdr;

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

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

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

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

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

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

		       keyidx);

		if (skb->dev)

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

drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c

+24 −24
Original line number Diff line number Diff line
@@ -311,8 +311,8 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device* ieee, struct sk_buff *skb, 
	    strcmp(crypt->ops->name, "TKIP") == 0) {

		if (net_ratelimit()) {

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

			       "received packet from " MAC_FMT "\n",

			       ieee->dev->name, MAC_ARG(hdr->addr2));

			       "received packet from %pM\n",

			       ieee->dev->name, hdr->addr2);

		}

		return -1;

	}
@@ -323,8 +323,8 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device* ieee, struct sk_buff *skb, 
	atomic_dec(&crypt->refcnt);

	if (res < 0) {

		IEEE80211_DEBUG_DROP(

			"decryption failed (SA=" MAC_FMT

			") res=%d\n", MAC_ARG(hdr->addr2), res);

			"decryption failed (SA=%pM"

			") res=%d\n", hdr->addr2, res);

		if (res == -2)

			IEEE80211_DEBUG_DROP("Decryption failed ICV "

					     "mismatch (key %d)\n",
@@ -356,8 +356,8 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device* ieee, struct sk_buff *s 
	atomic_dec(&crypt->refcnt);

	if (res < 0) {

		printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed"

		       " (SA=" MAC_FMT " keyidx=%d)\n",

		       ieee->dev->name, MAC_ARG(hdr->addr2), keyidx);

		       " (SA=%pM keyidx=%d)\n",

		       ieee->dev->name, hdr->addr2, keyidx);

		return -1;

	}
@@ -550,8 +550,8 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb, 
			 * frames silently instead of filling system log with

			 * these reports. */

			IEEE80211_DEBUG_DROP("Decryption failed (not set)"

					     " (SA=" MAC_FMT ")\n",

					     MAC_ARG(hdr->addr2));

					     " (SA=%pM)\n",

					     hdr->addr2);

			ieee->ieee_stats.rx_discards_undecryptable++;

			goto rx_dropped;

		}
@@ -709,8 +709,8 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb, 
		} else {

			IEEE80211_DEBUG_DROP(

				"encryption configured, but RX "

				"frame not encrypted (SA=" MAC_FMT ")\n",

				MAC_ARG(hdr->addr2));

				"frame not encrypted (SA=%pM)\n",

				hdr->addr2);

			goto rx_dropped;

		}

	}
@@ -729,9 +729,9 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb, 
	    !ieee80211_is_eapol_frame(ieee, skb, hdrlen)) {

		IEEE80211_DEBUG_DROP(

			"dropped unencrypted RX data "

			"frame from " MAC_FMT

			"frame from %pM"

			" (drop_unencrypted=1)\n",

			MAC_ARG(hdr->addr2));

			hdr->addr2);

		goto rx_dropped;

	}

/*
@@ -1196,11 +1196,11 @@ inline int ieee80211_network_init( 
	}



	if (network->mode == 0) {

		IEEE80211_DEBUG_SCAN("Filtered out '%s (" MAC_FMT ")' "

		IEEE80211_DEBUG_SCAN("Filtered out '%s (%pM)' "

				     "network.\n",

				     escape_essid(network->ssid,

						  network->ssid_len),

				     MAC_ARG(network->bssid));

				     network->bssid);

		return 1;

	}
@@ -1341,9 +1341,9 @@ inline void ieee80211_process_probe_response( 
	memset(&network, 0, sizeof(struct ieee80211_network));



	IEEE80211_DEBUG_SCAN(

		"'%s' (" MAC_FMT "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",

		"'%s' (%pM): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",

		escape_essid(info_element->data, info_element->len),

		MAC_ARG(beacon->header.addr3),

		beacon->header.addr3,

		(beacon->capability & (1<<0xf)) ? '1' : '0',

		(beacon->capability & (1<<0xe)) ? '1' : '0',

		(beacon->capability & (1<<0xd)) ? '1' : '0',
@@ -1362,10 +1362,10 @@ inline void ieee80211_process_probe_response( 
		(beacon->capability & (1<<0x0)) ? '1' : '0');



	if (ieee80211_network_init(ieee, beacon, &network, stats)) {

		IEEE80211_DEBUG_SCAN("Dropped '%s' (" MAC_FMT ") via %s.\n",

		IEEE80211_DEBUG_SCAN("Dropped '%s' (%pM) via %s.\n",

				     escape_essid(info_element->data,

						  info_element->len),

				     MAC_ARG(beacon->header.addr3),

				     beacon->header.addr3,

				     WLAN_FC_GET_STYPE(beacon->header.frame_ctl) ==

				     IEEE80211_STYPE_PROBE_RESP ?

				     "PROBE RESPONSE" : "BEACON");
@@ -1464,11 +1464,11 @@ inline void ieee80211_process_probe_response( 
			/* If there are no more slots, expire the oldest */

			list_del(&oldest->list);

			target = oldest;

			IEEE80211_DEBUG_SCAN("Expired '%s' (" MAC_FMT ") from "

			IEEE80211_DEBUG_SCAN("Expired '%s' (%pM) from "

					     "network list.\n",

					     escape_essid(target->ssid,

							  target->ssid_len),

					     MAC_ARG(target->bssid));

					     target->bssid);

		} else {

			/* Otherwise just pull from the free list */

			target = list_entry(ieee->network_free_list.next,
@@ -1478,10 +1478,10 @@ inline void ieee80211_process_probe_response( 




#ifdef CONFIG_IEEE80211_DEBUG

		IEEE80211_DEBUG_SCAN("Adding '%s' (" MAC_FMT ") via %s.\n",

		IEEE80211_DEBUG_SCAN("Adding '%s' (%pM) via %s.\n",

				     escape_essid(network.ssid,

						  network.ssid_len),

				     MAC_ARG(network.bssid),

				     network.bssid,

				     WLAN_FC_GET_STYPE(beacon->header.frame_ctl) ==

				     IEEE80211_STYPE_PROBE_RESP ?

				     "PROBE RESPONSE" : "BEACON");
@@ -1492,10 +1492,10 @@ inline void ieee80211_process_probe_response( 
		if(ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE)

			ieee80211_softmac_new_net(ieee,&network);

	} else {

		IEEE80211_DEBUG_SCAN("Updating '%s' (" MAC_FMT ") via %s.\n",

		IEEE80211_DEBUG_SCAN("Updating '%s' (%pM) via %s.\n",

				     escape_essid(target->ssid,

						  target->ssid_len),

				     MAC_ARG(target->bssid),

				     target->bssid,

				     WLAN_FC_GET_STYPE(beacon->header.frame_ctl) ==

				     IEEE80211_STYPE_PROBE_RESP ?

				     "PROBE RESPONSE" : "BEACON");

drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c

+1 −1
Original line number Diff line number Diff line
@@ -1573,7 +1573,7 @@ ieee80211_rx_assoc_rq(struct ieee80211_device *ieee, struct sk_buff *skb) 
		ieee80211_resp_to_assoc_rq(ieee, dest);

	}



	printk(KERN_INFO"New client associated: "MAC_FMT"\n", MAC_ARG(dest));

	printk(KERN_INFO"New client associated: %pM\n", dest);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE