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/rndis_wlan.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/rndis_wlan.c')
-rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index 2b414899dfa0..bd059e3c7e2b 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
@@ -1276,12 +1276,11 @@ static int rndis_iw_get_bssid(struct net_device *dev, | |||
1276 | struct usbnet *usbdev = dev->priv; | 1276 | struct usbnet *usbdev = dev->priv; |
1277 | unsigned char bssid[ETH_ALEN]; | 1277 | unsigned char bssid[ETH_ALEN]; |
1278 | int ret; | 1278 | int ret; |
1279 | DECLARE_MAC_BUF(mac); | ||
1280 | 1279 | ||
1281 | ret = get_bssid(usbdev, bssid); | 1280 | ret = get_bssid(usbdev, bssid); |
1282 | 1281 | ||
1283 | if (ret == 0) | 1282 | if (ret == 0) |
1284 | devdbg(usbdev, "SIOCGIWAP: %s", print_mac(mac, bssid)); | 1283 | devdbg(usbdev, "SIOCGIWAP: %pM", bssid); |
1285 | else | 1284 | else |
1286 | devdbg(usbdev, "SIOCGIWAP: <not associated>"); | 1285 | devdbg(usbdev, "SIOCGIWAP: <not associated>"); |
1287 | 1286 | ||
@@ -1297,10 +1296,9 @@ static int rndis_iw_set_bssid(struct net_device *dev, | |||
1297 | { | 1296 | { |
1298 | struct usbnet *usbdev = dev->priv; | 1297 | struct usbnet *usbdev = dev->priv; |
1299 | u8 *bssid = (u8 *)wrqu->ap_addr.sa_data; | 1298 | u8 *bssid = (u8 *)wrqu->ap_addr.sa_data; |
1300 | DECLARE_MAC_BUF(mac); | ||
1301 | int ret; | 1299 | int ret; |
1302 | 1300 | ||
1303 | devdbg(usbdev, "SIOCSIWAP: %s", print_mac(mac, bssid)); | 1301 | devdbg(usbdev, "SIOCSIWAP: %pM", bssid); |
1304 | 1302 | ||
1305 | ret = rndis_set_oid(usbdev, OID_802_11_BSSID, bssid, ETH_ALEN); | 1303 | ret = rndis_set_oid(usbdev, OID_802_11_BSSID, bssid, ETH_ALEN); |
1306 | 1304 | ||
@@ -1660,11 +1658,10 @@ static char *rndis_translate_scan(struct net_device *dev, | |||
1660 | u32 beacon, atim; | 1658 | u32 beacon, atim; |
1661 | struct iw_event iwe; | 1659 | struct iw_event iwe; |
1662 | unsigned char sbuf[32]; | 1660 | unsigned char sbuf[32]; |
1663 | DECLARE_MAC_BUF(mac); | ||
1664 | 1661 | ||
1665 | bssid_len = le32_to_cpu(bssid->length); | 1662 | bssid_len = le32_to_cpu(bssid->length); |
1666 | 1663 | ||
1667 | devdbg(usbdev, "BSSID %s", print_mac(mac, bssid->mac)); | 1664 | devdbg(usbdev, "BSSID %pM", bssid->mac); |
1668 | iwe.cmd = SIOCGIWAP; | 1665 | iwe.cmd = SIOCGIWAP; |
1669 | iwe.u.ap_addr.sa_family = ARPHRD_ETHER; | 1666 | iwe.u.ap_addr.sa_family = ARPHRD_ETHER; |
1670 | memcpy(iwe.u.ap_addr.sa_data, bssid->mac, ETH_ALEN); | 1667 | memcpy(iwe.u.ap_addr.sa_data, bssid->mac, ETH_ALEN); |