diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-30 13:51:29 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-30 13:51:29 -0800 |
| commit | 3a999e6eb5d277cd6a321dcda3fc43c3d9e4e4b8 (patch) | |
| tree | b0ad8d03710ee556e97515ba1c949233859391ce /drivers/net/wireless/libertas | |
| parent | 6cd9b49d7328c4656bfc17fcb47fb814955d40d2 (diff) | |
| parent | 891dc5e73783eeabd2a704a9425e2a199b39c9f9 (diff) | |
| download | talos-op-linux-3a999e6eb5d277cd6a321dcda3fc43c3d9e4e4b8.tar.gz talos-op-linux-3a999e6eb5d277cd6a321dcda3fc43c3d9e4e4b8.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/libertas')
| -rw-r--r-- | drivers/net/wireless/libertas/scan.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c index 4a0c3e3cd3b1..220361e69cd3 100644 --- a/drivers/net/wireless/libertas/scan.c +++ b/drivers/net/wireless/libertas/scan.c @@ -567,11 +567,8 @@ int lbs_scan_networks(struct lbs_private *priv, int full_scan) chan_count = lbs_scan_create_channel_list(priv, chan_list); netif_stop_queue(priv->dev); - netif_carrier_off(priv->dev); - if (priv->mesh_dev) { + if (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, scan_channel %d\n", @@ -635,16 +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 && 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); |
