aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2008-11-25 16:47:36 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-11-26 09:47:52 -0500
commitb235507cc5e552b9e75678d596727249e8fba01b (patch)
tree5e39960a812c1e70153c9f2245bf8e7269c5e720 /drivers/net/wireless
parent860c6e6a15c5082e1a1ff1faeb56cdf439380e87 (diff)
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>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/mac80211_hwsim.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index d8b5cf389405..530648b39935 100644
--- 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,
452 hwsim_check_magic(vif); 452 hwsim_check_magic(vif);
453 if (conf->changed & IEEE80211_IFCC_BSSID) { 453 if (conf->changed & IEEE80211_IFCC_BSSID) {
454 DECLARE_MAC_BUF(mac); 454 DECLARE_MAC_BUF(mac);
455 printk(KERN_DEBUG "%s:%s: BSSID changed: %s\n", 455 printk(KERN_DEBUG "%s:%s: BSSID changed: %pM\n",
456 wiphy_name(hw->wiphy), __func__, 456 wiphy_name(hw->wiphy), __func__,
457 print_mac(mac, conf->bssid)); 457 conf->bssid);
458 memcpy(vp->bssid, conf->bssid, ETH_ALEN); 458 memcpy(vp->bssid, conf->bssid, ETH_ALEN);
459 } 459 }
460 return 0; 460 return 0;
@@ -612,9 +612,8 @@ static void hwsim_send_ps_poll(void *dat, u8 *mac, struct ieee80211_vif *vif)
612 if (!vp->assoc) 612 if (!vp->assoc)
613 return; 613 return;
614 614
615 printk(KERN_DEBUG "%s:%s: send PS-Poll to %s for aid %d\n", 615 printk(KERN_DEBUG "%s:%s: send PS-Poll to %pM for aid %d\n",
616 wiphy_name(data->hw->wiphy), __func__, 616 wiphy_name(data->hw->wiphy), __func__, vp->bssid, vp->aid);
617 print_mac(buf, vp->bssid), vp->aid);
618 617
619 skb = dev_alloc_skb(sizeof(*pspoll)); 618 skb = dev_alloc_skb(sizeof(*pspoll));
620 if (!skb) 619 if (!skb)
@@ -644,9 +643,8 @@ static void hwsim_send_nullfunc(struct mac80211_hwsim_data *data, u8 *mac,
644 if (!vp->assoc) 643 if (!vp->assoc)
645 return; 644 return;
646 645
647 printk(KERN_DEBUG "%s:%s: send data::nullfunc to %s ps=%d\n", 646 printk(KERN_DEBUG "%s:%s: send data::nullfunc to %pM ps=%d\n",
648 wiphy_name(data->hw->wiphy), __func__, 647 wiphy_name(data->hw->wiphy), __func__, vp->bssid, ps);
649 print_mac(buf, vp->bssid), ps);
650 648
651 skb = dev_alloc_skb(sizeof(*hdr)); 649 skb = dev_alloc_skb(sizeof(*hdr));
652 if (!skb) 650 if (!skb)