projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: convert print_mac to %pM
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
net
/
wireless
/
libertas
/
main.c
diff --git
a/drivers/net/wireless/libertas/main.c
b/drivers/net/wireless/libertas/main.c
index 73dc8c72402a93fbfa85d1477869d370454c4cd2..34a47f692bd64e16bd9b96cf613bfb5f7605d1cb 100644
(file)
--- 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,
{
int i = nr_addrs;
struct dev_mc_list *mc_list;
{
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;
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)) {
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);
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);
i++;
}
netif_addr_unlock_bh(dev);