diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-27 18:59:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-27 20:06:18 -0400 |
commit | e174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch) | |
tree | e8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/wireless/mac80211_hwsim.c | |
parent | 0c68ae2605dbcf67414d8d1f19af93be44b355fb (diff) |
net: convert print_mac to %pM
This converts pretty much everything to print_mac. There were
a few things that had conflicts which I have just dropped for
now, no harm done.
I've built an allyesconfig with this and looked at the files
that weren't built very carefully, but it's a huge patch.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/mac80211_hwsim.c')
-rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 1a019e98dac3..88c5eec0607c 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c | |||
@@ -301,10 +301,9 @@ static void mac80211_hwsim_stop(struct ieee80211_hw *hw) | |||
301 | static int mac80211_hwsim_add_interface(struct ieee80211_hw *hw, | 301 | static int mac80211_hwsim_add_interface(struct ieee80211_hw *hw, |
302 | struct ieee80211_if_init_conf *conf) | 302 | struct ieee80211_if_init_conf *conf) |
303 | { | 303 | { |
304 | DECLARE_MAC_BUF(mac); | 304 | printk(KERN_DEBUG "%s:%s (type=%d mac_addr=%pM)\n", |
305 | printk(KERN_DEBUG "%s:%s (type=%d mac_addr=%s)\n", | ||
306 | wiphy_name(hw->wiphy), __func__, conf->type, | 305 | wiphy_name(hw->wiphy), __func__, conf->type, |
307 | print_mac(mac, conf->mac_addr)); | 306 | conf->mac_addr); |
308 | hwsim_set_magic(conf->vif); | 307 | hwsim_set_magic(conf->vif); |
309 | return 0; | 308 | return 0; |
310 | } | 309 | } |
@@ -313,10 +312,9 @@ static int mac80211_hwsim_add_interface(struct ieee80211_hw *hw, | |||
313 | static void mac80211_hwsim_remove_interface( | 312 | static void mac80211_hwsim_remove_interface( |
314 | struct ieee80211_hw *hw, struct ieee80211_if_init_conf *conf) | 313 | struct ieee80211_hw *hw, struct ieee80211_if_init_conf *conf) |
315 | { | 314 | { |
316 | DECLARE_MAC_BUF(mac); | 315 | printk(KERN_DEBUG "%s:%s (type=%d mac_addr=%pM)\n", |
317 | printk(KERN_DEBUG "%s:%s (type=%d mac_addr=%s)\n", | ||
318 | wiphy_name(hw->wiphy), __func__, conf->type, | 316 | wiphy_name(hw->wiphy), __func__, conf->type, |
319 | print_mac(mac, conf->mac_addr)); | 317 | conf->mac_addr); |
320 | hwsim_check_magic(conf->vif); | 318 | hwsim_check_magic(conf->vif); |
321 | hwsim_clear_magic(conf->vif); | 319 | hwsim_clear_magic(conf->vif); |
322 | } | 320 | } |
@@ -505,7 +503,6 @@ static int __init init_mac80211_hwsim(void) | |||
505 | u8 addr[ETH_ALEN]; | 503 | u8 addr[ETH_ALEN]; |
506 | struct mac80211_hwsim_data *data; | 504 | struct mac80211_hwsim_data *data; |
507 | struct ieee80211_hw *hw; | 505 | struct ieee80211_hw *hw; |
508 | DECLARE_MAC_BUF(mac); | ||
509 | 506 | ||
510 | if (radios < 1 || radios > 100) | 507 | if (radios < 1 || radios > 100) |
511 | return -EINVAL; | 508 | return -EINVAL; |
@@ -588,9 +585,9 @@ static int __init init_mac80211_hwsim(void) | |||
588 | goto failed_hw; | 585 | goto failed_hw; |
589 | } | 586 | } |
590 | 587 | ||
591 | printk(KERN_DEBUG "%s: hwaddr %s registered\n", | 588 | printk(KERN_DEBUG "%s: hwaddr %pM registered\n", |
592 | wiphy_name(hw->wiphy), | 589 | wiphy_name(hw->wiphy), |
593 | print_mac(mac, hw->wiphy->perm_addr)); | 590 | hw->wiphy->perm_addr); |
594 | 591 | ||
595 | setup_timer(&data->beacon_timer, mac80211_hwsim_beacon, | 592 | setup_timer(&data->beacon_timer, mac80211_hwsim_beacon, |
596 | (unsigned long) hw); | 593 | (unsigned long) hw); |