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>
This commit is contained in:
committed by
David S. Miller
parent
0c68ae2605
commit
e174961ca1
@@ -588,7 +588,6 @@ static int lbs_add_mcast_addrs(struct cmd_ds_mac_multicast_adr *cmd,
|
||||
{
|
||||
int i = nr_addrs;
|
||||
struct dev_mc_list *mc_list;
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
if ((dev->flags & (IFF_UP|IFF_MULTICAST)) != (IFF_UP|IFF_MULTICAST))
|
||||
return nr_addrs;
|
||||
@@ -596,16 +595,16 @@ static int lbs_add_mcast_addrs(struct cmd_ds_mac_multicast_adr *cmd,
|
||||
netif_addr_lock_bh(dev);
|
||||
for (mc_list = dev->mc_list; mc_list; mc_list = mc_list->next) {
|
||||
if (mac_in_list(cmd->maclist, nr_addrs, mc_list->dmi_addr)) {
|
||||
lbs_deb_net("mcast address %s:%s skipped\n", dev->name,
|
||||
print_mac(mac, mc_list->dmi_addr));
|
||||
lbs_deb_net("mcast address %s:%pM skipped\n", dev->name,
|
||||
mc_list->dmi_addr);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (i == MRVDRV_MAX_MULTICAST_LIST_SIZE)
|
||||
break;
|
||||
memcpy(&cmd->maclist[6*i], mc_list->dmi_addr, ETH_ALEN);
|
||||
lbs_deb_net("mcast address %s:%s added to filter\n", dev->name,
|
||||
print_mac(mac, mc_list->dmi_addr));
|
||||
lbs_deb_net("mcast address %s:%pM added to filter\n", dev->name,
|
||||
mc_list->dmi_addr);
|
||||
i++;
|
||||
}
|
||||
netif_addr_unlock_bh(dev);
|
||||
|
Reference in New Issue
Block a user