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/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/libertas/main.c')
-rw-r--r-- | drivers/net/wireless/libertas/main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index 73dc8c72402a..34a47f692bd6 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c | |||
@@ -588,7 +588,6 @@ static int lbs_add_mcast_addrs(struct cmd_ds_mac_multicast_adr *cmd, | |||
588 | { | 588 | { |
589 | int i = nr_addrs; | 589 | int i = nr_addrs; |
590 | struct dev_mc_list *mc_list; | 590 | struct dev_mc_list *mc_list; |
591 | DECLARE_MAC_BUF(mac); | ||
592 | 591 | ||
593 | if ((dev->flags & (IFF_UP|IFF_MULTICAST)) != (IFF_UP|IFF_MULTICAST)) | 592 | if ((dev->flags & (IFF_UP|IFF_MULTICAST)) != (IFF_UP|IFF_MULTICAST)) |
594 | return nr_addrs; | 593 | return nr_addrs; |
@@ -596,16 +595,16 @@ static int lbs_add_mcast_addrs(struct cmd_ds_mac_multicast_adr *cmd, | |||
596 | netif_addr_lock_bh(dev); | 595 | netif_addr_lock_bh(dev); |
597 | for (mc_list = dev->mc_list; mc_list; mc_list = mc_list->next) { | 596 | for (mc_list = dev->mc_list; mc_list; mc_list = mc_list->next) { |
598 | if (mac_in_list(cmd->maclist, nr_addrs, mc_list->dmi_addr)) { | 597 | if (mac_in_list(cmd->maclist, nr_addrs, mc_list->dmi_addr)) { |
599 | lbs_deb_net("mcast address %s:%s skipped\n", dev->name, | 598 | lbs_deb_net("mcast address %s:%pM skipped\n", dev->name, |
600 | print_mac(mac, mc_list->dmi_addr)); | 599 | mc_list->dmi_addr); |
601 | continue; | 600 | continue; |
602 | } | 601 | } |
603 | 602 | ||
604 | if (i == MRVDRV_MAX_MULTICAST_LIST_SIZE) | 603 | if (i == MRVDRV_MAX_MULTICAST_LIST_SIZE) |
605 | break; | 604 | break; |
606 | memcpy(&cmd->maclist[6*i], mc_list->dmi_addr, ETH_ALEN); | 605 | memcpy(&cmd->maclist[6*i], mc_list->dmi_addr, ETH_ALEN); |
607 | lbs_deb_net("mcast address %s:%s added to filter\n", dev->name, | 606 | lbs_deb_net("mcast address %s:%pM added to filter\n", dev->name, |
608 | print_mac(mac, mc_list->dmi_addr)); | 607 | mc_list->dmi_addr); |
609 | i++; | 608 | i++; |
610 | } | 609 | } |
611 | netif_addr_unlock_bh(dev); | 610 | netif_addr_unlock_bh(dev); |