9 files changed, 42 insertions, 90 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 261ab7150431..cd2fb955040f 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -774,7 +774,6 @@ void ipoib_mcast_restart_task(struct work_struct *work)
         ipoib_mcast_stop_thread(dev, 0);
 
         local_irq_save(flags);
-        netif_tx_lock(dev);
         netif_addr_lock(dev);
         spin_lock(&priv->lock);
 
@@ -853,7 +852,6 @@ void ipoib_mcast_restart_task(struct work_struct *work)
 
         spin_unlock(&priv->lock);
         netif_addr_unlock(dev);
-        netif_tx_unlock(dev);
         local_irq_restore(flags);
 
         /* We have to cancel outside of the spinlock */
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c
index 809d18c663bc..c2c033722a93 100644
--- a/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/drivers/media/dvb/dvb-core/dvb_net.c
@@ -1133,8 +1133,7 @@ static void wq_set_multicast_list (struct work_struct *work)
 
         dvb_net_feed_stop(dev);
         priv->rx_mode = RX_MODE_UNI;
-        netif_tx_lock_bh(dev);
-        netif_addr_lock(dev);
+        netif_addr_lock_bh(dev);
 
         if (dev->flags & IFF_PROMISC) {
                 dprintk("%s: promiscuous mode\n", dev->name);
@@ -1159,8 +1158,7 @@ static void wq_set_multicast_list (struct work_struct *work)
                 }
         }
 
-        netif_addr_unlock(dev);
-        netif_tx_unlock_bh(dev);
+        netif_addr_unlock_bh(dev);
         dvb_net_feed_start(dev);
 }
 
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index ea71abd6f728..fd87dbe7999a 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1567,14 +1567,12 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                                 goto err_close;
                 }
 
-                netif_tx_lock_bh(bond_dev);
-                netif_addr_lock(bond_dev);
+                netif_addr_lock_bh(bond_dev);
                 /* upload master's mc_list to new slave */
                 for (dmi = bond_dev->mc_list; dmi; dmi = dmi->next) {
                         dev_mc_add (slave_dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
                 }
-                netif_addr_unlock(bond_dev);
-                netif_tx_unlock_bh(bond_dev);
+                netif_addr_unlock_bh(bond_dev);
         }
 
         if (bond->params.mode == BOND_MODE_8023AD) {
@@ -1938,11 +1936,9 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                 }
 
                 /* flush master's mc_list from slave */
-                netif_tx_lock_bh(bond_dev);
-                netif_addr_lock(bond_dev);
+                netif_addr_lock_bh(bond_dev);
                 bond_mc_list_flush(bond_dev, slave_dev);
-                netif_addr_unlock(bond_dev);
-                netif_tx_unlock_bh(bond_dev);
+                netif_addr_unlock_bh(bond_dev);
         }
 
         netdev_set_master(slave_dev, NULL);
@@ -2063,11 +2059,9 @@ static int bond_release_all(struct net_device *bond_dev)
                         }
 
                         /* flush master's mc_list from slave */
-                        netif_tx_lock_bh(bond_dev);
-                        netif_addr_lock(bond_dev);
+                        netif_addr_lock_bh(bond_dev);
                         bond_mc_list_flush(bond_dev, slave_dev);
-                        netif_addr_unlock(bond_dev);
-                        netif_tx_unlock_bh(bond_dev);
+                        netif_addr_unlock_bh(bond_dev);
                 }
 
                 netdev_set_master(slave_dev, NULL);
@@ -4679,11 +4673,9 @@ static void bond_free_all(void)
                 struct net_device *bond_dev = bond->dev;
 
                 bond_work_cancel_all(bond);
-                netif_tx_lock_bh(bond_dev);
-                netif_addr_lock(bond_dev);
+                netif_addr_lock_bh(bond_dev);
                 bond_mc_list_destroy(bond);
-                netif_addr_unlock(bond_dev);
-                netif_tx_unlock_bh(bond_dev);
+                netif_addr_unlock_bh(bond_dev);
                 /* Release the bonded slaves */
                 bond_release_all(bond_dev);
                 bond_destroy(bond);
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index e1257e556e48..7b2015f9e469 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -696,10 +696,8 @@ static void efx_stop_port(struct efx_nic *efx)
 
         /* Serialise against efx_set_multicast_list() */
         if (efx_dev_registered(efx)) {
-                netif_tx_lock_bh(efx->net_dev);
-                netif_addr_lock(efx->net_dev);
-                netif_addr_unlock(efx->net_dev);
-                netif_tx_unlock_bh(efx->net_dev);
+                netif_addr_lock_bh(efx->net_dev);
+                netif_addr_unlock_bh(efx->net_dev);
         }
 }
 
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,
         if ((dev->flags & (IFF_UP|IFF_MULTICAST)) != (IFF_UP|IFF_MULTICAST))
                 return nr_addrs;
 
-        netif_tx_lock_bh(dev);
-        netif_addr_lock(dev);
+        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,
@@ -609,8 +608,7 @@ static int lbs_add_mcast_addrs(struct cmd_ds_mac_multicast_adr *cmd,
                             print_mac(mac, mc_list->dmi_addr));
                 i++;
         }
-        netif_addr_unlock(dev);
-        netif_tx_unlock_bh(dev);
+        netif_addr_unlock_bh(dev);
         if (mc_list)
                 return -EOVERFLOW;
 
diff --git a/net/core/dev.c b/net/core/dev.c
index ef1502d71f25..9b49f74a9820 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2981,11 +2981,9 @@ void __dev_set_rx_mode(struct net_device *dev)
 
 void dev_set_rx_mode(struct net_device *dev)
 {
-        netif_tx_lock_bh(dev);
-        netif_addr_lock(dev);
+        netif_addr_lock_bh(dev);
         __dev_set_rx_mode(dev);
-        netif_addr_unlock(dev);
-        netif_tx_unlock_bh(dev);
+        netif_addr_unlock_bh(dev);
 }
 
 int __dev_addr_delete(struct dev_addr_list **list, int *count,
@@ -3063,13 +3061,11 @@ int dev_unicast_delete(struct net_device *dev, void *addr, int alen)
 
         ASSERT_RTNL();
 
-        netif_tx_lock_bh(dev);
-        netif_addr_lock(dev);
+        netif_addr_lock_bh(dev);
         err = __dev_addr_delete(&dev->uc_list, &dev->uc_count, addr, alen, 0);
         if (!err)
                 __dev_set_rx_mode(dev);
-        netif_addr_unlock(dev);
-        netif_tx_unlock_bh(dev);
+        netif_addr_unlock_bh(dev);
         return err;
 }
 EXPORT_SYMBOL(dev_unicast_delete);
@@ -3091,13 +3087,11 @@ int dev_unicast_add(struct net_device *dev, void *addr, int alen)
 
         ASSERT_RTNL();
 
-        netif_tx_lock_bh(dev);
-        netif_addr_lock(dev);
+        netif_addr_lock_bh(dev);
         err = __dev_addr_add(&dev->uc_list, &dev->uc_count, addr, alen, 0);
         if (!err)
                 __dev_set_rx_mode(dev);
-        netif_addr_unlock(dev);
-        netif_tx_unlock_bh(dev);
+        netif_addr_unlock_bh(dev);
         return err;
 }
 EXPORT_SYMBOL(dev_unicast_add);
@@ -3164,14 +3158,12 @@ int dev_unicast_sync(struct net_device *to, struct net_device *from)
 {
         int err = 0;
 
-        netif_tx_lock_bh(to);
-        netif_addr_lock(to);
+        netif_addr_lock_bh(to);
         err = __dev_addr_sync(&to->uc_list, &to->uc_count,
                               &from->uc_list, &from->uc_count);
         if (!err)
                 __dev_set_rx_mode(to);
-        netif_addr_unlock(to);
-        netif_tx_unlock_bh(to);
+        netif_addr_unlock_bh(to);
         return err;
 }
 EXPORT_SYMBOL(dev_unicast_sync);
@@ -3187,9 +3179,7 @@ EXPORT_SYMBOL(dev_unicast_sync);
  */
 void dev_unicast_unsync(struct net_device *to, struct net_device *from)
 {
-        netif_tx_lock_bh(from);
-        netif_addr_lock(from);
-        netif_tx_lock_bh(to);
+        netif_addr_lock_bh(from);
         netif_addr_lock(to);
 
         __dev_addr_unsync(&to->uc_list, &to->uc_count,
@@ -3197,9 +3187,7 @@ void dev_unicast_unsync(struct net_device *to, struct net_device *from)
         __dev_set_rx_mode(to);
 
         netif_addr_unlock(to);
-        netif_tx_unlock_bh(to);
-        netif_addr_unlock(from);
-        netif_tx_unlock_bh(from);
+        netif_addr_unlock_bh(from);
 }
 EXPORT_SYMBOL(dev_unicast_unsync);
 
@@ -3219,8 +3207,7 @@ static void __dev_addr_discard(struct dev_addr_list **list)
 
 static void dev_addr_discard(struct net_device *dev)
 {
-        netif_tx_lock_bh(dev);
-        netif_addr_lock(dev);
+        netif_addr_lock_bh(dev);
 
         __dev_addr_discard(&dev->uc_list);
         dev->uc_count = 0;
@@ -3228,8 +3215,7 @@ static void dev_addr_discard(struct net_device *dev)
         __dev_addr_discard(&dev->mc_list);
         dev->mc_count = 0;
 
-        netif_addr_unlock(dev);
-        netif_tx_unlock_bh(dev);
+        netif_addr_unlock_bh(dev);
 }
 
 unsigned dev_get_flags(const struct net_device *dev)
diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c
index b6b2a129971a..5402b3b38e0d 100644
--- a/net/core/dev_mcast.c
+++ b/net/core/dev_mcast.c
@@ -72,8 +72,7 @@ int dev_mc_delete(struct net_device *dev, void *addr, int alen, int glbl)
 {
         int err;
 
-        netif_tx_lock_bh(dev);
-        netif_addr_lock(dev);
+        netif_addr_lock_bh(dev);
         err = __dev_addr_delete(&dev->mc_list, &dev->mc_count,
                                 addr, alen, glbl);
         if (!err) {
@@ -84,8 +83,7 @@ int dev_mc_delete(struct net_device *dev, void *addr, int alen, int glbl)
 
                 __dev_set_rx_mode(dev);
         }
-        netif_addr_unlock(dev);
-        netif_tx_unlock_bh(dev);
+        netif_addr_unlock_bh(dev);
         return err;
 }
 
@@ -97,13 +95,11 @@ int dev_mc_add(struct net_device *dev, void *addr, int alen, int glbl)
 {
         int err;
 
-        netif_tx_lock_bh(dev);
-        netif_addr_lock(dev);
+        netif_addr_lock_bh(dev);
         err = __dev_addr_add(&dev->mc_list, &dev->mc_count, addr, alen, glbl);
         if (!err)
                 __dev_set_rx_mode(dev);
-        netif_addr_unlock(dev);
-        netif_tx_unlock_bh(dev);
+        netif_addr_unlock_bh(dev);
         return err;
 }
 
@@ -123,14 +119,12 @@ int dev_mc_sync(struct net_device *to, struct net_device *from)
 {
         int err = 0;
 
-        netif_tx_lock_bh(to);
-        netif_addr_lock(to);
+        netif_addr_lock_bh(to);
         err = __dev_addr_sync(&to->mc_list, &to->mc_count,
                               &from->mc_list, &from->mc_count);
         if (!err)
                 __dev_set_rx_mode(to);
-        netif_addr_unlock(to);
-        netif_tx_unlock_bh(to);
+        netif_addr_unlock_bh(to);
 
         return err;
 }
@@ -149,9 +143,7 @@ EXPORT_SYMBOL(dev_mc_sync);
  */
 void dev_mc_unsync(struct net_device *to, struct net_device *from)
 {
-        netif_tx_lock_bh(from);
-        netif_addr_lock(from);
-        netif_tx_lock_bh(to);
+        netif_addr_lock_bh(from);
         netif_addr_lock(to);
 
         __dev_addr_unsync(&to->mc_list, &to->mc_count,
@@ -159,9 +151,7 @@ void dev_mc_unsync(struct net_device *to, struct net_device *from)
         __dev_set_rx_mode(to);
 
         netif_addr_unlock(to);
-        netif_tx_unlock_bh(to);
-        netif_addr_unlock(from);
-        netif_tx_unlock_bh(from);
+        netif_addr_unlock_bh(from);
 }
 EXPORT_SYMBOL(dev_mc_unsync);
 
@@ -174,8 +164,7 @@ static int dev_mc_seq_show(struct seq_file *seq, void *v)
         if (v == SEQ_START_TOKEN)
                 return 0;
 
-        netif_tx_lock_bh(dev);
-        netif_addr_lock(dev);
+        netif_addr_lock_bh(dev);
         for (m = dev->mc_list; m; m = m->next) {
                 int i;
 
@@ -187,8 +176,7 @@ static int dev_mc_seq_show(struct seq_file *seq, void *v)
 
                 seq_putc(seq, '\n');
         }
-        netif_addr_unlock(dev);
-        netif_tx_unlock_bh(dev);
+        netif_addr_unlock_bh(dev);
         return 0;
 }
 
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 095b7d928d64..af0056e7e5b3 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -291,11 +291,9 @@ static int ieee80211_open(struct net_device *dev)
                 if (sdata->u.mntr_flags & MONITOR_FLAG_OTHER_BSS)
                         local->fif_other_bss++;
 
-                netif_tx_lock_bh(local->mdev);
-                netif_addr_lock(local->mdev);
+                netif_addr_lock_bh(local->mdev);
                 ieee80211_configure_filter(local);
-                netif_addr_unlock(local->mdev);
-                netif_tx_unlock_bh(local->mdev);
+                netif_addr_unlock_bh(local->mdev);
                 break;
         case IEEE80211_IF_TYPE_STA:
         case IEEE80211_IF_TYPE_IBSS:
@@ -492,11 +490,9 @@ static int ieee80211_stop(struct net_device *dev)
                 if (sdata->u.mntr_flags & MONITOR_FLAG_OTHER_BSS)
                         local->fif_other_bss--;
 
-                netif_tx_lock_bh(local->mdev);
-                netif_addr_lock(local->mdev);
+                netif_addr_lock_bh(local->mdev);
                 ieee80211_configure_filter(local);
-                netif_addr_unlock(local->mdev);
-                netif_tx_unlock_bh(local->mdev);
+                netif_addr_unlock_bh(local->mdev);
                 break;
         case IEEE80211_IF_TYPE_MESH_POINT:
         case IEEE80211_IF_TYPE_STA:
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 1232ba25e1e9..d7c371e36bf0 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -4064,16 +4064,14 @@ static int ieee80211_sta_start_scan(struct net_device *dev,
         local->scan_band = IEEE80211_BAND_2GHZ;
         local->scan_dev = dev;
 
-        netif_tx_lock_bh(local->mdev);
-        netif_addr_lock(local->mdev);
+        netif_addr_lock_bh(local->mdev);
         local->filter_flags |= FIF_BCN_PRBRESP_PROMISC;
         local->ops->configure_filter(local_to_hw(local),
                                      FIF_BCN_PRBRESP_PROMISC,
                                      &local->filter_flags,
                                      local->mdev->mc_count,
                                      local->mdev->mc_list);
-        netif_addr_unlock(local->mdev);
-        netif_tx_unlock_bh(local->mdev);
+        netif_addr_unlock_bh(local->mdev);
 
         /* TODO: start scan as soon as all nullfunc frames are ACKed */
         queue_delayed_work(local->hw.workqueue, &local->scan_work,