diff options
Diffstat (limited to 'net/mac80211/tkip.c')
-rw-r--r-- | net/mac80211/tkip.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c index b9c1d5405180..5b11f14abfba 100644 --- a/net/mac80211/tkip.c +++ b/net/mac80211/tkip.c | |||
@@ -275,9 +275,10 @@ int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm, | |||
275 | (iv32 == key->u.tkip.iv32_rx[queue] && | 275 | (iv32 == key->u.tkip.iv32_rx[queue] && |
276 | iv16 <= key->u.tkip.iv16_rx[queue]))) { | 276 | iv16 <= key->u.tkip.iv16_rx[queue]))) { |
277 | #ifdef CONFIG_TKIP_DEBUG | 277 | #ifdef CONFIG_TKIP_DEBUG |
278 | DECLARE_MAC_BUF(mac); | ||
278 | printk(KERN_DEBUG "TKIP replay detected for RX frame from " | 279 | printk(KERN_DEBUG "TKIP replay detected for RX frame from " |
279 | MAC_FMT " (RX IV (%04x,%02x) <= prev. IV (%04x,%02x)\n", | 280 | "%s (RX IV (%04x,%02x) <= prev. IV (%04x,%02x)\n", |
280 | MAC_ARG(ta), | 281 | print_mac(mac, ta), |
281 | iv32, iv16, key->u.tkip.iv32_rx[queue], | 282 | iv32, iv16, key->u.tkip.iv32_rx[queue], |
282 | key->u.tkip.iv16_rx[queue]); | 283 | key->u.tkip.iv16_rx[queue]); |
283 | #endif /* CONFIG_TKIP_DEBUG */ | 284 | #endif /* CONFIG_TKIP_DEBUG */ |
@@ -299,8 +300,9 @@ int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm, | |||
299 | #ifdef CONFIG_TKIP_DEBUG | 300 | #ifdef CONFIG_TKIP_DEBUG |
300 | { | 301 | { |
301 | int i; | 302 | int i; |
302 | printk(KERN_DEBUG "TKIP decrypt: Phase1 TA=" MAC_FMT | 303 | DECLARE_MAC_BUF(mac); |
303 | " TK=", MAC_ARG(ta)); | 304 | printk(KERN_DEBUG "TKIP decrypt: Phase1 TA=%s" |
305 | " TK=", print_mac(mac, ta)); | ||
304 | for (i = 0; i < 16; i++) | 306 | for (i = 0; i < 16; i++) |
305 | printk("%02x ", | 307 | printk("%02x ", |
306 | key->conf.key[ | 308 | key->conf.key[ |