drivers/staging/rtl8187x: Use %pM for mac address output
PATCH 1/1 drivers/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 Joe Perches <[email protected]>
--- drivers/staging/rtl8187se/ieee80211/ieee80211.h | 4 -- .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 21 +++----- .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 20 ++++---- drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 48 +++++++++--------- .../rtl8187se/ieee80211/ieee80211_softmac.c | 2 +- drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 6 +- drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 4 +- drivers/staging/rtl8192e/ieee80211.h | 3 - drivers/staging/rtl8192e/ieee80211/ieee80211.h | 3 - .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 18 +++---- .../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 27 +++++----- drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 52 ++++++++++---------- .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 2 +- drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 4 +- drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 4 +- .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c | 6 +- .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 6 +- drivers/staging/rtl8192e/r8192E_core.c | 2 +- drivers/staging/rtl8192su/ieee80211/ieee80211.h | 4 -- .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 21 +++----- .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 20 ++++---- drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 48 +++++++++--------- .../rtl8192su/ieee80211/ieee80211_softmac.c | 2 +- drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 4 +- drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 4 +- .../staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 6 +- .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 6 +- drivers/staging/rtl8192su/r8192U_core.c | 2 +- drivers/staging/rtl8192su/r8192U_dm.c | 2 +- drivers/staging/rtl8192u/ieee80211.h | 3 - drivers/staging/rtl8192u/ieee80211/ieee80211.h | 3 - .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 21 +++----- .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 20 ++++---- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 48 +++++++++--------- .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +- drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 4 +- drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 4 +- .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 6 +- .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 6 +- drivers/staging/rtl8192u/r8192U_core.c | 4 +- 40 files changed, 221 insertions(+), 251 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 +9 -12
@@ -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
@@ -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
134 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_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 -2
@@ -234,10 +234,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" , +"%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 )); } }
drivers/staging/rtl8192e/ieee80211.h +0 -3
@@ -547,9 +547,6 @@ do { if (ieee80211_debug_level & (level)) \/* debug macros not dependent on 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/rtl8192e/ieee80211/ieee80211.h +0 -3
@@ -615,9 +615,6 @@ do { if (ieee80211_debug_level & (level)) \/* debug macros not dependent on 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/rtl8192e/ieee80211/ieee80211_crypt_ccmp.c +8 -10
@@ -331,7 +331,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 ;
@@ -344,9 +344,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 ; }
@@ -361,11 +361,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 ;
@@ -402,7 +400,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 ;
@@ -482,7 +480,7 @@ static char * ieee80211_ccmp_print_stats(char *p, void *priv)"rx_pn=%02x%02x%02x%02x%02x%02x " "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/rtl8192e/ieee80211/ieee80211_crypt_tkip.c +14 -13
@@ -520,7 +520,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 ; }
@@ -532,9 +532,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 ; }
@@ -547,9 +547,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++;
@@ -582,8 +582,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 ; }
@@ -606,8 +606,9 @@ 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 ;
@@ -816,8 +817,8 @@ static void ieee80211_michael_mic_failure(struct net_device *dev,/* TODO: needed parameters: count, keyid, key type, TSC */ sprintf (buf,"MLME-MICHAELMICFAILURE.indication(keyid=%d %scast addr=" -MAC_FMT ")" , keyidx, hdr->addr1[0 ] &0x01 ?"broad" :"uni" , -MAC_ARG (hdr->addr2)); +"%pM)" , keyidx, hdr->addr1[0 ] &0x01 ?"broad" :"uni" , + hdr->addr2);memset (&wrqu,0 ,sizeof (wrqu)); wrqu.data.length =strlen (buf);wireless_send_event (dev,IWEVCUSTOM , &wrqu, buf);
@@ -862,8 +863,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/rtl8192e/ieee80211/ieee80211_rx.c +26 -26
144 lines not on this page · raw message
drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c +1 -1
@@ -1897,7 +1897,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);//FIXME #if 0 spin_lock_irqsave (&ieee->lock,flags);
drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c +2 -2
@@ -200,8 +200,8 @@ int ieee80211_encrypt_fragment( header = (struct ieee80211_hdr *) 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 ; }
drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c +2 -2
@@ -386,10 +386,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" , +"%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 )); }
drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c +3 -3
@@ -113,7 +113,7 @@ static struct sk_buff* ieee80211_ADDBA(struct ieee80211_device* ieee, u8* Dst, Pu16 tmp =0 ;u16 len = ieee->tx_headroom +9 ;//category(1) + action field(1) + Dialog Token(1) + BA Parameter Set(2) + BA Timeout Value(2) + BA Start SeqCtrl(2)(or StatusCode(2)) -IEEE80211_DEBUG (IEEE80211_DL_TRACE |IEEE80211_DL_BA ,"========>%s(), frame(%d) sentd to:" MAC_FMT ", ieee->dev:%p\n" , __FUNCTION__, type,MAC_ARG (Dst), ieee->dev); +IEEE80211_DEBUG (IEEE80211_DL_TRACE |IEEE80211_DL_BA ,"========>%s(), frame(%d) sentd to:%pM, ieee->dev:%p\n" , __FUNCTION__, type, Dst, ieee->dev);if (pBA ==NULL ||ieee ==NULL ) {IEEE80211_DEBUG (IEEE80211_DL_ERR ,"pBA(%p) is NULL or ieee(%p) is NULL\n" , pBA, ieee);
@@ -243,7 +243,7 @@ static struct sk_buff* ieee80211_DELBA(u16 len =6 + ieee->tx_headroom;if (net_ratelimit ()) -IEEE80211_DEBUG (IEEE80211_DL_TRACE |IEEE80211_DL_BA ,"========>%s(), ReasonCode(%d) sentd to:" MAC_FMT "\n" , __FUNCTION__, ReasonCode,MAC_ARG (dst)); +IEEE80211_DEBUG (IEEE80211_DL_TRACE |IEEE80211_DL_BA ,"========>%s(), ReasonCode(%d) sentd to:%pM\n" , __FUNCTION__, ReasonCode, dst);memset (&DelbaParamSet,0 ,2 );
@@ -397,7 +397,7 @@ int ieee80211_rx_ADDBAReq( struct ieee80211_device* ieee, struct sk_buff *skb) pBaTimeoutVal = (u16 *)(tag +5 ); pBaStartSeqCtrl = (PSEQUENCE_CONTROL )(req +7 ); -printk ("====================>rx ADDBAREQ from :" MAC_FMT "\n" ,MAC_ARG (dst)); +printk ("====================>rx ADDBAREQ from :%pM\n" , dst);//some other capability is not ready now. if ( (ieee->current_network.qos_data.active ==0 ) || (ieee->pHTInfo->bCurrentHTSupport == false))//||
drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c +3 -3
@@ -304,7 +304,7 @@ PTS_COMMON_INFO SearchAdmitTRStream(struct ieee80211_device *ieee, u8* Addr, u8if (search_dir[dir] ==false )continue ;list_for_each_entry (pRet, psearch_list, List){ -// IEEE80211_DEBUG(IEEE80211_DL_TS, "ADD:"MAC_FMT", TID:%d, dir:%d\n", MAC_ARG(pRet->Addr), pRet->TSpec.f.TSInfo.field.ucTSID, pRet->TSpec.f.TSInfo.field.ucDirection); +// IEEE80211_DEBUG(IEEE80211_DL_TS, "ADD:%pM, TID:%d, dir:%d\n", pRet->Addr, pRet->TSpec.f.TSInfo.field.ucTSID, pRet->TSpec.f.TSInfo.field.ucDirection); if (memcmp (pRet->Addr, Addr,6 ) ==0 )if (pRet->TSpec.f.TSInfo.field.ucTSID ==TID )if (pRet->TSpec.f.TSInfo.field.ucDirection == dir)
@@ -466,7 +466,7 @@ bool GetTs(ResetRxTsEntry (tmp); } -IEEE80211_DEBUG (IEEE80211_DL_TS ,"to init current TS, UP:%d, Dir:%d, addr:" MAC_FMT "\n" ,UP , Dir,MAC_ARG (Addr)); +IEEE80211_DEBUG (IEEE80211_DL_TS ,"to init current TS, UP:%d, Dir:%d, addr:%pM\n" ,UP , Dir, Addr);// Prepare TS Info releated field pTSInfo->field.ucTrafficType =0 ;// Traffic type: WMM is reserved in this field pTSInfo->field.ucTSID =UP ;// TSID
@@ -552,7 +552,7 @@ void RemoveTsEntry(void RemovePeerTS (struct ieee80211_device * ieee,u8 * Addr) {PTS_COMMON_INFO pTS, pTmpTS; -printk ("===========>RemovePeerTS," MAC_FMT "\n" ,MAC_ARG (Addr)); +printk ("===========>RemovePeerTS,%pM\n" , Addr);#if 1 list_for_each_entry_safe (pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List) {
drivers/staging/rtl8192e/r8192E_core.c +1 -1
@@ -6394,7 +6394,7 @@ void setKey( struct net_device *dev,if (EntryNo >=TOTAL_CAM_ENTRY )RT_TRACE (COMP_ERR ,"cam entry exceeds in setKey()\n" ); -RT_TRACE (COMP_SEC ,"====>to setKey(), dev:%p, EntryNo:%d, KeyIndex:%d, KeyType:%d, MacAddr" MAC_FMT "\n" , dev,EntryNo, KeyIndex, KeyType,MAC_ARG (MacAddr)); +RT_TRACE (COMP_SEC ,"====>to setKey(), dev:%p, EntryNo:%d, KeyIndex:%d, KeyType:%d, MacAddr%pM\n" , dev,EntryNo, KeyIndex, KeyType, MacAddr);if (DefaultKey) usConfig |=BIT15 | (KeyType<<2 );
drivers/staging/rtl8192su/ieee80211/ieee80211.h +0 -4
@@ -195,10 +195,6 @@ extern u32 ieee80211_debug_level;#define IEEE80211_DEBUG_DATA (level, data, datalen) 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/rtl8192su/ieee80211/ieee80211_crypt_ccmp.c +9 -12
@@ -288,7 +288,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 ;
@@ -301,9 +301,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 ; }
@@ -318,11 +318,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 ;
@@ -359,7 +357,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 ;
@@ -435,11 +433,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/rtl8192su/ieee80211/ieee80211_crypt_tkip.c +10 -10
@@ -410,7 +410,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 ; }
@@ -422,9 +422,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 ; }
@@ -437,9 +437,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++;
@@ -460,8 +460,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 ; }
@@ -480,7 +480,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 ;
@@ -635,8 +635,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/rtl8192su/ieee80211/ieee80211_rx.c +24 -24
134 lines not on this page · raw message
drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c +1 -1
@@ -1709,7 +1709,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);//FIXME }
drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c +2 -2
@@ -199,8 +199,8 @@ int ieee80211_encrypt_fragment( header = (struct rtl_ieee80211_hdr *)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 ; }
drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c +2 -2
@@ -261,10 +261,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" , +"%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 )); }
drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c +3 -3
@@ -113,7 +113,7 @@ static struct sk_buff* ieee80211_ADDBA(struct ieee80211_device* ieee, u8* Dst, Pu16 tmp =0 ;u16 len = ieee->tx_headroom +9 ;//category(1) + action field(1) + Dialog Token(1) + BA Parameter Set(2) + BA Timeout Value(2) + BA Start SeqCtrl(2)(or StatusCode(2)) -IEEE80211_DEBUG (IEEE80211_DL_TRACE |IEEE80211_DL_BA ,"========>%s(), frame(%d) sentd to:" MAC_FMT ", ieee->dev:%p\n" , __FUNCTION__, type,MAC_ARG (Dst), ieee->dev); +IEEE80211_DEBUG (IEEE80211_DL_TRACE |IEEE80211_DL_BA ,"========>%s(), frame(%d) sentd to:%pM, ieee->dev:%p\n" , __FUNCTION__, type, Dst, ieee->dev);if (pBA ==NULL ||ieee ==NULL ) {IEEE80211_DEBUG (IEEE80211_DL_ERR ,"pBA(%p) is NULL or ieee(%p) is NULL\n" , pBA, ieee);
@@ -200,7 +200,7 @@ static struct sk_buff* ieee80211_DELBA(u16 len =6 + ieee->tx_headroom;if (net_ratelimit ()) -IEEE80211_DEBUG (IEEE80211_DL_TRACE |IEEE80211_DL_BA ,"========>%s(), ReasonCode(%d) sentd to:" MAC_FMT "\n" , __FUNCTION__, ReasonCode,MAC_ARG (dst)); +IEEE80211_DEBUG (IEEE80211_DL_TRACE |IEEE80211_DL_BA ,"========>%s(), ReasonCode(%d) sentd to:%pM\n" , __FUNCTION__, ReasonCode, dst);memset (&DelbaParamSet,0 ,2 );
@@ -354,7 +354,7 @@ int ieee80211_rx_ADDBAReq( struct ieee80211_device* ieee, struct sk_buff *skb) pBaTimeoutVal = (u16 *)(tag +5 ); pBaStartSeqCtrl = (PSEQUENCE_CONTROL )(req +7 ); -printk ("====================>rx ADDBAREQ from :" MAC_FMT "\n" ,MAC_ARG (dst)); +printk ("====================>rx ADDBAREQ from :%pM\n" , dst);//some other capability is not ready now. if( (ieee->current_network.qos_data.active == 0) || (ieee->pHTInfo->bCurrentHTSupport == false) ||
drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c +3 -3
@@ -291,7 +291,7 @@ PTS_COMMON_INFO SearchAdmitTRStream(struct ieee80211_device *ieee, u8* Addr, u8if (search_dir[dir] ==false )continue ;list_for_each_entry (pRet, psearch_list, List){ -// IEEE80211_DEBUG(IEEE80211_DL_TS, "ADD:"MAC_FMT", TID:%d, dir:%d\n", MAC_ARG(pRet->Addr), pRet->TSpec.f.TSInfo.field.ucTSID, pRet->TSpec.f.TSInfo.field.ucDirection); +// IEEE80211_DEBUG(IEEE80211_DL_TS, "ADD:%pM, TID:%d, dir:%d\n", pRet->Addr, pRet->TSpec.f.TSInfo.field.ucTSID, pRet->TSpec.f.TSInfo.field.ucDirection); if (memcmp (pRet->Addr, Addr,6 ) ==0 )if (pRet->TSpec.f.TSInfo.field.ucTSID ==TID )if (pRet->TSpec.f.TSInfo.field.ucDirection == dir)
@@ -447,7 +447,7 @@ bool GetTs(ResetRxTsEntry (tmp); } -IEEE80211_DEBUG (IEEE80211_DL_TS ,"to init current TS, UP:%d, Dir:%d, addr:" MAC_FMT "\n" ,UP , Dir,MAC_ARG (Addr)); +IEEE80211_DEBUG (IEEE80211_DL_TS ,"to init current TS, UP:%d, Dir:%d, addr:%pM\n" ,UP , Dir, Addr);// Prepare TS Info releated field pTSInfo->field.ucTrafficType =0 ;// Traffic type: WMM is reserved in this field pTSInfo->field.ucTSID =UP ;// TSID
@@ -533,7 +533,7 @@ void RemoveTsEntry(void RemovePeerTS (struct ieee80211_device * ieee,u8 * Addr) {PTS_COMMON_INFO pTS, pTmpTS; -printk ("===========>RemovePeerTS," MAC_FMT "\n" ,MAC_ARG (Addr)); +printk ("===========>RemovePeerTS,%pM\n" , Addr);#if 1 list_for_each_entry_safe (pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List) {
drivers/staging/rtl8192su/r8192U_core.c +1 -1
@@ -7675,7 +7675,7 @@ void setKey( struct net_device *dev,if (EntryNo >=TOTAL_CAM_ENTRY )RT_TRACE (COMP_ERR ,"cam entry exceeds in setKey()\n" ); -RT_TRACE (COMP_SEC ,"====>to setKey(), dev:%p, EntryNo:%d, KeyIndex:%d, KeyType:%d, MacAddr" MAC_FMT "\n" , dev,EntryNo, KeyIndex, KeyType,MAC_ARG (MacAddr)); +RT_TRACE (COMP_SEC ,"====>to setKey(), dev:%p, EntryNo:%d, KeyIndex:%d, KeyType:%d, MacAddr%pM\n" , dev,EntryNo, KeyIndex, KeyType, MacAddr);if (DefaultKey) usConfig |=BIT15 | (KeyType<<2 );
drivers/staging/rtl8192su/r8192U_dm.c +1 -1
@@ -2697,7 +2697,7 @@ static void dm_check_edca_turbo(u8 * peername[11 ] = {"unknown" ,"realtek" ,"realtek_92se" ,"broadcom" ,"ralink" ,"atheros" ,"cisco" ,"marvell" ,"92u_softap" ,"self_softap" };static int wb_tmp =0 ;if (wb_tmp ==0 ){ -printk ("%s():iot peer is %#x:%s, bssid:" MAC_FMT "\n" ,__FUNCTION__,pHTInfo->IOTPeer,peername[pHTInfo->IOTPeer],MAC_ARG (priv->ieee80211->current_network.bssid)); +printk ("%s():iot peer is %#x:%s, bssid:%pM\n" ,__FUNCTION__,pHTInfo->IOTPeer,peername[pHTInfo->IOTPeer], priv->ieee80211->current_network.bssid); wb_tmp =1 ; } }
drivers/staging/rtl8192u/ieee80211.h +0 -3
@@ -551,9 +551,6 @@ do { if (ieee80211_debug_level & (level)) \/* debug macros not dependent on 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/rtl8192u/ieee80211/ieee80211.h +0 -3
@@ -551,9 +551,6 @@ do { if (ieee80211_debug_level & (level)) \/* debug macros not dependent on 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/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c +9 -12
@@ -288,7 +288,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 ;
@@ -301,9 +301,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 ; }
@@ -318,11 +318,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 ;
@@ -359,7 +357,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 ;
@@ -435,11 +433,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/rtl8192u/ieee80211/ieee80211_crypt_tkip.c +10 -10
@@ -410,7 +410,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 ; }
@@ -422,9 +422,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 ; }
@@ -437,9 +437,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++;
@@ -460,8 +460,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 ; }
@@ -480,7 +480,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 ;
@@ -635,8 +635,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/rtl8192u/ieee80211/ieee80211_rx.c +24 -24
134 lines not on this page · raw message
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +1 -1
@@ -1731,7 +1731,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);//FIXME }
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +2 -2
@@ -200,8 +200,8 @@ int ieee80211_encrypt_fragment( header = (struct ieee80211_hdr *) 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 ; }
drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c +2 -2
@@ -289,10 +289,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" , +"%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 )); }
drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c +3 -3
@@ -113,7 +113,7 @@ static struct sk_buff* ieee80211_ADDBA(struct ieee80211_device* ieee, u8* Dst, Pu16 tmp =0 ;u16 len = ieee->tx_headroom +9 ;//category(1) + action field(1) + Dialog Token(1) + BA Parameter Set(2) + BA Timeout Value(2) + BA Start SeqCtrl(2)(or StatusCode(2)) -IEEE80211_DEBUG (IEEE80211_DL_TRACE |IEEE80211_DL_BA ,"========>%s(), frame(%d) sentd to:" MAC_FMT ", ieee->dev:%p\n" , __FUNCTION__, type,MAC_ARG (Dst), ieee->dev); +IEEE80211_DEBUG (IEEE80211_DL_TRACE |IEEE80211_DL_BA ,"========>%s(), frame(%d) sentd to:%pM, ieee->dev:%p\n" , __FUNCTION__, type, Dst, ieee->dev);if (pBA ==NULL ||ieee ==NULL ) {IEEE80211_DEBUG (IEEE80211_DL_ERR ,"pBA(%p) is NULL or ieee(%p) is NULL\n" , pBA, ieee);
@@ -201,7 +201,7 @@ static struct sk_buff* ieee80211_DELBA(u16 len =6 + ieee->tx_headroom;if (net_ratelimit ()) -IEEE80211_DEBUG (IEEE80211_DL_TRACE |IEEE80211_DL_BA ,"========>%s(), ReasonCode(%d) sentd to:" MAC_FMT "\n" , __FUNCTION__, ReasonCode,MAC_ARG (dst)); +IEEE80211_DEBUG (IEEE80211_DL_TRACE |IEEE80211_DL_BA ,"========>%s(), ReasonCode(%d) sentd to:%pM\n" , __FUNCTION__, ReasonCode, dst);memset (&DelbaParamSet,0 ,2 );
@@ -355,7 +355,7 @@ int ieee80211_rx_ADDBAReq( struct ieee80211_device* ieee, struct sk_buff *skb) pBaTimeoutVal = (u16 *)(tag +5 ); pBaStartSeqCtrl = (PSEQUENCE_CONTROL )(req +7 ); -printk ("====================>rx ADDBAREQ from :" MAC_FMT "\n" ,MAC_ARG (dst)); +printk ("====================>rx ADDBAREQ from :%pM\n" , dst);//some other capability is not ready now. if ( (ieee->current_network.qos_data.active ==0 ) || (ieee->pHTInfo->bCurrentHTSupport == false))//||
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +3 -3
@@ -290,7 +290,7 @@ PTS_COMMON_INFO SearchAdmitTRStream(struct ieee80211_device *ieee, u8* Addr, u8if (search_dir[dir] ==false )continue ;list_for_each_entry (pRet, psearch_list, List){ -// IEEE80211_DEBUG(IEEE80211_DL_TS, "ADD:"MAC_FMT", TID:%d, dir:%d\n", MAC_ARG(pRet->Addr), pRet->TSpec.f.TSInfo.field.ucTSID, pRet->TSpec.f.TSInfo.field.ucDirection); +// IEEE80211_DEBUG(IEEE80211_DL_TS, "ADD:%pM, TID:%d, dir:%d\n", pRet->Addr, pRet->TSpec.f.TSInfo.field.ucTSID, pRet->TSpec.f.TSInfo.field.ucDirection); if (memcmp (pRet->Addr, Addr,6 ) ==0 )if (pRet->TSpec.f.TSInfo.field.ucTSID ==TID )if (pRet->TSpec.f.TSInfo.field.ucDirection == dir)
@@ -445,7 +445,7 @@ bool GetTs(ResetRxTsEntry (tmp); } -IEEE80211_DEBUG (IEEE80211_DL_TS ,"to init current TS, UP:%d, Dir:%d, addr:" MAC_FMT "\n" ,UP , Dir,MAC_ARG (Addr)); +IEEE80211_DEBUG (IEEE80211_DL_TS ,"to init current TS, UP:%d, Dir:%d, addr:%pM\n" ,UP , Dir, Addr);// Prepare TS Info releated field pTSInfo->field.ucTrafficType =0 ;// Traffic type: WMM is reserved in this field pTSInfo->field.ucTSID =UP ;// TSID
@@ -531,7 +531,7 @@ void RemoveTsEntry(void RemovePeerTS (struct ieee80211_device * ieee,u8 * Addr) {PTS_COMMON_INFO pTS, pTmpTS; -printk ("===========>RemovePeerTS," MAC_FMT "\n" ,MAC_ARG (Addr)); +printk ("===========>RemovePeerTS,%pM\n" , Addr);list_for_each_entry_safe (pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List) {if (memcmp (pTS->Addr, Addr,6 ) ==0 )
drivers/staging/rtl8192u/r8192U_core.c +2 -2
@@ -2976,7 +2976,7 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)memcpy (dev->dev_addr, bMac_Tmp_Addr,6 );//should I set IDR0 here? } -RT_TRACE (COMP_EPROM ,"MAC addr:" MAC_FMT "\n" ,MAC_ARG (dev->dev_addr)); +RT_TRACE (COMP_EPROM ,"MAC addr:%pM\n" , dev->dev_addr); priv->rf_type =RTL819X_DEFAULT_RF_TYPE ;//default 1T2R priv->rf_chip =RF_8256 ;
@@ -6037,7 +6037,7 @@ void setKey( struct net_device *dev,if (EntryNo >=TOTAL_CAM_ENTRY )RT_TRACE (COMP_ERR ,"cam entry exceeds in setKey()\n" ); -RT_TRACE (COMP_SEC ,"====>to setKey(), dev:%p, EntryNo:%d, KeyIndex:%d, KeyType:%d, MacAddr" MAC_FMT "\n" , dev,EntryNo, KeyIndex, KeyType,MAC_ARG (MacAddr)); +RT_TRACE (COMP_SEC ,"====>to setKey(), dev:%p, EntryNo:%d, KeyIndex:%d, KeyType:%d, MacAddr%pM\n" , dev,EntryNo, KeyIndex, KeyType, MacAddr);if (DefaultKey) usConfig |=BIT15 | (KeyType<<2 );
Quoted 1 line · Joe Perches
Uncompiled. Doesn't currently build anyway.
Builds here for me :)
Looks good, thanks.
greg k-h