From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 30 Dec 2009 20:25:08 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=891dc5e73783eeabd2a704a9425e2a199b39c9f9;p=linux-beck.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Conflicts:
	drivers/net/wireless/libertas/scan.c
---

891dc5e73783eeabd2a704a9425e2a199b39c9f9
diff --cc drivers/net/wireless/libertas/scan.c
index 4a0c3e3cd3b1,b0b1c7841500..220361e69cd3
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@@ -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);