staging/rtl8187se: use %p[Mm] to show MAC addresses
PATCH 1/1 staging/rtl8187se: use %p[Mm] to show MAC addresses
staging/rtl8187se: use %p[Mm] to show MAC addresses
Trivial, use the %p[Mm] extensions instead of the custom macros.
Signed-off-by H Hartley Sweeten <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
---
drivers/staging/rtl8187se/ieee80211/ieee80211.h | 4 -- .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 23 ++++----- .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 22 ++++---- drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 52 +++++++++----------- .../rtl8187se/ieee80211/ieee80211_softmac.c | 2 +- drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 6 +- drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 5 +- 7 files changed, 51 insertions(+), 63 deletions(-)
drivers/staging/rtl8187se/ieee80211/ieee80211.h +0 -4
@@ -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 +10 -13
@@ -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 ;
@@ -346,8 +344,8 @@ 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)); +printk (KERN_DEBUG "CCMP: decrypt failed: STA=%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 +11 -11
@@ -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 ; }
@@ -449,8 +449,8 @@ 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=" -MAC_FMT "\n" ,MAC_ARG (hdr->addr2)); +printk (KERN_DEBUG "TKIP: ICV error detected: STA=%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 -28
136 lines not on this page · raw message
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c +1 -1
@@ -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); }
drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c +3 -3
@@ -198,8 +198,8 @@ int ieee80211_encrypt_fragment( header = (struct ieee80211_hdr_4addr *)frag->data;if (net_ratelimit ()) {printk (KERN_DEBUG "%s: TKIP countermeasures: dropped " -"TX packet to " MAC_FMT "\n" , - ieee->dev->name,MAC_ARG (header->addr1)); +"TX packet to %pM\n" , + ieee->dev->name, header->addr1)); }return -1 ; }
@@ -407,7 +407,7 @@ int ieee80211_rtl_xmit(struct sk_buff *skb,memcpy (&header.addr2, src,ETH_ALEN );memcpy (&header.addr3, ieee->current_network.bssid,ETH_ALEN ); } -// printk(KERN_WARNING "essid MAC address is "MAC_FMT, MAC_ARG(&header.addr1)); +// printk(KERN_WARNING "essid MAC address is %pM", &header.addr1); header.frame_ctl =cpu_to_le16 (fc);//hdr_len = IEEE80211_3ADDR_LEN;
drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c +2 -3
@@ -233,11 +233,10 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee, }else IEEE80211_DEBUG_SCAN ( -"Not showing network '%s (" -MAC_FMT ")' due to age (%lums).\n" , +"Not showing network '%s (%pM)' due to age (%lums).\n" ,escape_essid (network->ssid, network->ssid_len), -MAC_ARG (network->bssid), + network->bssid, (jiffies - network->last_scanned) / (HZ /100 )); } }