mac80211_hwsim: fix-up some print_mac merge damage

Some print_mac -> %pM conversions got lost in some merge or another...

Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index d8b5cf3894055a42b11b16d862253344ce2c0903..530648b399358754a307b1840a13b6a931e4ccff 100644 (file)
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -452,9 +452,9 @@ static int mac80211_hwsim_config_interface(struct ieee80211_hw *hw,
        hwsim_check_magic(vif);
        if (conf->changed & IEEE80211_IFCC_BSSID) {
                DECLARE_MAC_BUF(mac);
-               printk(KERN_DEBUG "%s:%s: BSSID changed: %s\n",
+               printk(KERN_DEBUG "%s:%s: BSSID changed: %pM\n",
                       wiphy_name(hw->wiphy), __func__,
-                      print_mac(mac, conf->bssid));
+                      conf->bssid);
                memcpy(vp->bssid, conf->bssid, ETH_ALEN);
        }
        return 0;
@@ -612,9 +612,8 @@ static void hwsim_send_ps_poll(void *dat, u8 *mac, struct ieee80211_vif *vif)
        if (!vp->assoc)
                return;
 
-       printk(KERN_DEBUG "%s:%s: send PS-Poll to %s for aid %d\n",
-              wiphy_name(data->hw->wiphy), __func__,
-              print_mac(buf, vp->bssid), vp->aid);
+       printk(KERN_DEBUG "%s:%s: send PS-Poll to %pM for aid %d\n",
+              wiphy_name(data->hw->wiphy), __func__, vp->bssid, vp->aid);
 
        skb = dev_alloc_skb(sizeof(*pspoll));
        if (!skb)
@@ -644,9 +643,8 @@ static void hwsim_send_nullfunc(struct mac80211_hwsim_data *data, u8 *mac,
        if (!vp->assoc)
                return;
 
-       printk(KERN_DEBUG "%s:%s: send data::nullfunc to %s ps=%d\n",
-              wiphy_name(data->hw->wiphy), __func__,
-              print_mac(buf, vp->bssid), ps);
+       printk(KERN_DEBUG "%s:%s: send data::nullfunc to %pM ps=%d\n",
+              wiphy_name(data->hw->wiphy), __func__, vp->bssid, ps);
 
        skb = dev_alloc_skb(sizeof(*hdr));
        if (!skb)