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/libertas/debugfs.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/libertas/debugfs.c')
-rw-r--r-- | drivers/net/wireless/libertas/debugfs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c index 0aa0ce3b2c42..5f6bee493f23 100644 --- a/drivers/net/wireless/libertas/debugfs.c +++ b/drivers/net/wireless/libertas/debugfs.c | |||
@@ -65,7 +65,6 @@ static ssize_t lbs_getscantable(struct file *file, char __user *userbuf, | |||
65 | int numscansdone = 0, res; | 65 | int numscansdone = 0, res; |
66 | unsigned long addr = get_zeroed_page(GFP_KERNEL); | 66 | unsigned long addr = get_zeroed_page(GFP_KERNEL); |
67 | char *buf = (char *)addr; | 67 | char *buf = (char *)addr; |
68 | DECLARE_MAC_BUF(mac); | ||
69 | struct bss_descriptor * iter_bss; | 68 | struct bss_descriptor * iter_bss; |
70 | 69 | ||
71 | pos += snprintf(buf+pos, len-pos, | 70 | pos += snprintf(buf+pos, len-pos, |
@@ -77,10 +76,9 @@ static ssize_t lbs_getscantable(struct file *file, char __user *userbuf, | |||
77 | u16 privacy = (iter_bss->capability & WLAN_CAPABILITY_PRIVACY); | 76 | u16 privacy = (iter_bss->capability & WLAN_CAPABILITY_PRIVACY); |
78 | u16 spectrum_mgmt = (iter_bss->capability & WLAN_CAPABILITY_SPECTRUM_MGMT); | 77 | u16 spectrum_mgmt = (iter_bss->capability & WLAN_CAPABILITY_SPECTRUM_MGMT); |
79 | 78 | ||
80 | pos += snprintf(buf+pos, len-pos, | 79 | pos += snprintf(buf+pos, len-pos, "%02u| %03d | %04d | %pM |", |
81 | "%02u| %03d | %04d | %s |", | ||
82 | numscansdone, iter_bss->channel, iter_bss->rssi, | 80 | numscansdone, iter_bss->channel, iter_bss->rssi, |
83 | print_mac(mac, iter_bss->bssid)); | 81 | iter_bss->bssid); |
84 | pos += snprintf(buf+pos, len-pos, " %04x-", iter_bss->capability); | 82 | pos += snprintf(buf+pos, len-pos, " %04x-", iter_bss->capability); |
85 | pos += snprintf(buf+pos, len-pos, "%c%c%c |", | 83 | pos += snprintf(buf+pos, len-pos, "%c%c%c |", |
86 | ibss ? 'A' : 'I', privacy ? 'P' : ' ', | 84 | ibss ? 'A' : 'I', privacy ? 'P' : ' ', |