Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
John W. Linville [Wed, 30 Dec 2009 20:25:08 +0000 (15:25 -0500)]
Conflicts:
drivers/net/wireless/libertas/scan.c

16 files changed:
1  2 
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/b43/dma.c
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-3945.h
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/libertas/scan.c
drivers/net/wireless/libertas_tf/main.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/wl1271_cmd.c
drivers/net/wireless/zd1211rw/zd_mac.c
include/net/mac80211.h
net/mac80211/ibss.c
net/mac80211/tx.c
net/mac80211/util.c
net/wireless/mlme.c

Simple merge
Simple merge
Simple merge
@@@ -635,16 -632,13 +632,13 @@@ out2
        priv->scan_channel = 0;
  
  out:
-       if (priv->connect_status == LBS_CONNECTED) {
-               netif_carrier_on(priv->dev);
-               if (!priv->tx_pending_len)
-                       netif_wake_queue(priv->dev);
-       }
-       if (priv->mesh_dev && lbs_mesh_connected(priv)) {
-               netif_carrier_on(priv->mesh_dev);
-               if (!priv->tx_pending_len)
-                       netif_wake_queue(priv->mesh_dev);
-       }
+       if (priv->connect_status == LBS_CONNECTED && !priv->tx_pending_len)
+               netif_wake_queue(priv->dev);
 -      if (priv->mesh_dev && (priv->mesh_connect_status == LBS_CONNECTED) &&
++      if (priv->mesh_dev && lbs_mesh_connected(priv) &&
+           !priv->tx_pending_len)
+               netif_wake_queue(priv->mesh_dev);
        kfree(chan_list);
  
        lbs_deb_leave_args(LBS_DEB_SCAN, "ret %d", ret);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge