Upgrade b43 and mac80211.

[openwrt/staging/lynxis/omap.git] / package / mac80211 / src / net / mac80211 / tkip.c

diff --git a/package/mac80211/src/net/mac80211/tkip.c b/package/mac80211/src/net/mac80211/tkip.c
index 876cbe37107a3138dacc4072609841daba764948..3abe194e4d55328ae61aba0bdcd1515a299212fd 100644 (file)
--- a/package/mac80211/src/net/mac80211/tkip.c
+++ b/package/mac80211/src/net/mac80211/tkip.c
@@ -276,9 +276,10 @@ int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm,
             (iv32 == key->u.tkip.iv32_rx[queue] &&
              iv16 <= key->u.tkip.iv16_rx[queue]))) {
 #ifdef CONFIG_TKIP_DEBUG
+               DECLARE_MAC_BUF(mac);
                printk(KERN_DEBUG "TKIP replay detected for RX frame from "
-                      MAC_FMT " (RX IV (%04x,%02x) <= prev. IV (%04x,%02x)\n",
-                      MAC_ARG(ta),
+                      "%s (RX IV (%04x,%02x) <= prev. IV (%04x,%02x)\n",
+                      print_mac(mac, ta),
                       iv32, iv16, key->u.tkip.iv32_rx[queue],
                       key->u.tkip.iv16_rx[queue]);
 #endif /* CONFIG_TKIP_DEBUG */
@@ -300,8 +301,9 @@ int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm,
 #ifdef CONFIG_TKIP_DEBUG
                {
                        int i;
-                       printk(KERN_DEBUG "TKIP decrypt: Phase1 TA=" MAC_FMT
-                              " TK=", MAC_ARG(ta));
+                       DECLARE_MAC_BUF(mac);
+                       printk(KERN_DEBUG "TKIP decrypt: Phase1 TA=%s"
+                              " TK=", print_mac(mac, ta));
                        for (i = 0; i < 16; i++)
                                printk("%02x ",
                                       key->conf.key[