diff options
| author | Jens Muecke <jens@nons.de> | 2008-01-24 03:03:04 +0000 |
|---|---|---|
| committer | Jens Muecke <jens@nons.de> | 2008-01-24 03:03:04 +0000 |
| commit | 3829f7b3f1ce44131a25f34d3c21ee33ab1ba7fa (patch) | |
| tree | 12be7757f7f03efb1eeb53266dc48496b0d99b2f /package/libertas/src/scan.c | |
| parent | 8ee2e7a4a3161b73949836276e5fd847c44f1c10 (diff) | |
| download | upstream-3829f7b3f1ce44131a25f34d3c21ee33ab1ba7fa.tar.gz upstream-3829f7b3f1ce44131a25f34d3c21ee33ab1ba7fa.tar.bz2 upstream-3829f7b3f1ce44131a25f34d3c21ee33ab1ba7fa.zip | |
Updating libertas wireless driver to latest version.
SVN-Revision: 10235
Diffstat (limited to 'package/libertas/src/scan.c')
| -rw-r--r-- | package/libertas/src/scan.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/package/libertas/src/scan.c b/package/libertas/src/scan.c index 92d84c72e2..9a61188b62 100644 --- a/package/libertas/src/scan.c +++ b/package/libertas/src/scan.c @@ -590,13 +590,13 @@ int lbs_scan_networks(struct lbs_private *priv, netif_stop_queue(priv->dev); netif_carrier_off(priv->dev); if (priv->mesh_dev) { - netif_stop_queue(priv->mesh_dev); - netif_carrier_off(priv->mesh_dev); + netif_stop_queue(priv->mesh_dev); + netif_carrier_off(priv->mesh_dev); } /* Prepare to continue an interrupted scan */ lbs_deb_scan("chan_count %d, last_scanned_channel %d\n", - chan_count, priv->last_scanned_channel); + chan_count, priv->last_scanned_channel); curr_chans = chan_list; /* advance channel list by already-scanned-channels */ if (priv->last_scanned_channel > 0) { @@ -659,11 +659,13 @@ out2: out: if (priv->connect_status == LBS_CONNECTED) { netif_carrier_on(priv->dev); - netif_wake_queue(priv->dev); + if (!priv->tx_pending_len) + netif_wake_queue(priv->dev); } if (priv->mesh_dev && (priv->mesh_connect_status == LBS_CONNECTED)) { netif_carrier_on(priv->mesh_dev); - netif_wake_queue(priv->mesh_dev); + if (!priv->tx_pending_len) + netif_wake_queue(priv->mesh_dev); } kfree(chan_list); |