diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/libertas/main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index 42e9b2771eab..14d5d61cec4c 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c | |||
@@ -593,8 +593,7 @@ static int lbs_add_mcast_addrs(struct cmd_ds_mac_multicast_adr *cmd, | |||
593 | if ((dev->flags & (IFF_UP|IFF_MULTICAST)) != (IFF_UP|IFF_MULTICAST)) | 593 | if ((dev->flags & (IFF_UP|IFF_MULTICAST)) != (IFF_UP|IFF_MULTICAST)) |
594 | return nr_addrs; | 594 | return nr_addrs; |
595 | 595 | ||
596 | netif_tx_lock_bh(dev); | 596 | netif_addr_lock_bh(dev); |
597 | netif_addr_lock(dev); | ||
598 | for (mc_list = dev->mc_list; mc_list; mc_list = mc_list->next) { | 597 | for (mc_list = dev->mc_list; mc_list; mc_list = mc_list->next) { |
599 | if (mac_in_list(cmd->maclist, nr_addrs, mc_list->dmi_addr)) { | 598 | if (mac_in_list(cmd->maclist, nr_addrs, mc_list->dmi_addr)) { |
600 | lbs_deb_net("mcast address %s:%s skipped\n", dev->name, | 599 | lbs_deb_net("mcast address %s:%s skipped\n", dev->name, |
@@ -609,8 +608,7 @@ static int lbs_add_mcast_addrs(struct cmd_ds_mac_multicast_adr *cmd, | |||
609 | print_mac(mac, mc_list->dmi_addr)); | 608 | print_mac(mac, mc_list->dmi_addr)); |
610 | i++; | 609 | i++; |
611 | } | 610 | } |
612 | netif_addr_unlock(dev); | 611 | netif_addr_unlock_bh(dev); |
613 | netif_tx_unlock_bh(dev); | ||
614 | if (mc_list) | 612 | if (mc_list) |
615 | return -EOVERFLOW; | 613 | return -EOVERFLOW; |
616 | 614 | ||