ACPI: thinkpad-acpi: revert keymap changes

[linux-2.6] / net / mac80211 / rc80211_simple.c

diff --git a/net/mac80211/rc80211_simple.c b/net/mac80211/rc80211_simple.c
index ef91ce428acaafaede5a9d0fd6f3609984152c59..314b8de888625c576a02fbd50caa01fc7787d84d 100644 (file)
--- a/net/mac80211/rc80211_simple.c
+++ b/net/mac80211/rc80211_simple.c
@@ -201,9 +201,10 @@ static void rate_control_simple_tx_status(void *priv, struct net_device *dev,
                srctrl->avg_rate_update = jiffies;
                if (srctrl->tx_avg_rate_num > 0) {
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                       printk(KERN_DEBUG "%s: STA " MAC_FMT " Average rate: "
+                       DECLARE_MAC_BUF(mac);
+                       printk(KERN_DEBUG "%s: STA %s Average rate: "
                               "%d (%d/%d)\n",
-                              dev->name, MAC_ARG(sta->addr),
+                              dev->name, print_mac(mac, sta->addr),
                               srctrl->tx_avg_rate_sum /
                               srctrl->tx_avg_rate_num,
                               srctrl->tx_avg_rate_sum,