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/arlan-main.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/arlan-main.c')
| -rw-r--r-- | drivers/net/wireless/arlan-main.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c index dec5e874a54d..b608643d5fcc 100644 --- a/drivers/net/wireless/arlan-main.c +++ b/drivers/net/wireless/arlan-main.c | |||
| @@ -1467,19 +1467,17 @@ static void arlan_rx_interrupt(struct net_device *dev, u_char rxStatus, u_short | |||
| 1467 | else if (hw_dst_addr[1] == 0x40) | 1467 | else if (hw_dst_addr[1] == 0x40) |
| 1468 | printk(KERN_ERR "%s m/bcast 0x0140 \n", dev->name); | 1468 | printk(KERN_ERR "%s m/bcast 0x0140 \n", dev->name); |
| 1469 | while (dmi) | 1469 | while (dmi) |
| 1470 | { if (dmi->dmi_addrlen == 6) | 1470 | { |
| 1471 | { | 1471 | if (dmi->dmi_addrlen == 6) { |
| 1472 | DECLARE_MAC_BUF(mac); | ||
| 1473 | if (arlan_debug & ARLAN_DEBUG_HEADER_DUMP) | 1472 | if (arlan_debug & ARLAN_DEBUG_HEADER_DUMP) |
| 1474 | printk(KERN_ERR "%s mcl %s\n", | 1473 | printk(KERN_ERR "%s mcl %pM\n", |
| 1475 | dev->name, print_mac(mac, dmi->dmi_addr)); | 1474 | dev->name, dmi->dmi_addr); |
| 1476 | for (i = 0; i < 6; i++) | 1475 | for (i = 0; i < 6; i++) |
| 1477 | if (dmi->dmi_addr[i] != hw_dst_addr[i]) | 1476 | if (dmi->dmi_addr[i] != hw_dst_addr[i]) |
| 1478 | break; | 1477 | break; |
| 1479 | if (i == 6) | 1478 | if (i == 6) |
| 1480 | break; | 1479 | break; |
| 1481 | } | 1480 | } else |
| 1482 | else | ||
| 1483 | printk(KERN_ERR "%s: invalid multicast address length given.\n", dev->name); | 1481 | printk(KERN_ERR "%s: invalid multicast address length given.\n", dev->name); |
| 1484 | dmi = dmi->next; | 1482 | dmi = dmi->next; |
| 1485 | } | 1483 | } |
| @@ -1512,18 +1510,14 @@ static void arlan_rx_interrupt(struct net_device *dev, u_char rxStatus, u_short | |||
| 1512 | { | 1510 | { |
| 1513 | char immedDestAddress[6]; | 1511 | char immedDestAddress[6]; |
| 1514 | char immedSrcAddress[6]; | 1512 | char immedSrcAddress[6]; |
| 1515 | DECLARE_MAC_BUF(mac); | ||
| 1516 | DECLARE_MAC_BUF(mac2); | ||
| 1517 | DECLARE_MAC_BUF(mac3); | ||
| 1518 | DECLARE_MAC_BUF(mac4); | ||
| 1519 | memcpy_fromio(immedDestAddress, arlan->immedDestAddress, 6); | 1513 | memcpy_fromio(immedDestAddress, arlan->immedDestAddress, 6); |
| 1520 | memcpy_fromio(immedSrcAddress, arlan->immedSrcAddress, 6); | 1514 | memcpy_fromio(immedSrcAddress, arlan->immedSrcAddress, 6); |
| 1521 | 1515 | ||
| 1522 | printk(KERN_WARNING "%s t %s f %s imd %s ims %s\n", | 1516 | printk(KERN_WARNING "%s t %pM f %pM imd %pM ims %pM\n", |
| 1523 | dev->name, print_mac(mac, skbtmp), | 1517 | dev->name, skbtmp, |
| 1524 | print_mac(mac2, &skbtmp[6]), | 1518 | &skbtmp[6], |
| 1525 | print_mac(mac3, immedDestAddress), | 1519 | immedDestAddress, |
| 1526 | print_mac(mac4, immedSrcAddress)); | 1520 | immedSrcAddress); |
| 1527 | } | 1521 | } |
| 1528 | skb->protocol = eth_type_trans(skb, dev); | 1522 | skb->protocol = eth_type_trans(skb, dev); |
| 1529 | IFDEBUG(ARLAN_DEBUG_HEADER_DUMP) | 1523 | IFDEBUG(ARLAN_DEBUG_HEADER_DUMP) |