mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-07 03:18:31 +00:00
libertas: Remove carrier signaling from the scan code
There is no reason to signal a carrier off when doing a 802.11 scan. Cc: Holger Schurig <holgerschurig@gmail.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Acked-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
5b0691508a
commit
659c8e5243
1 changed files with 8 additions and 14 deletions
|
@ -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);
|
chan_count = lbs_scan_create_channel_list(priv, chan_list);
|
||||||
|
|
||||||
netif_stop_queue(priv->dev);
|
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_stop_queue(priv->mesh_dev);
|
||||||
netif_carrier_off(priv->mesh_dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Prepare to continue an interrupted scan */
|
/* Prepare to continue an interrupted scan */
|
||||||
lbs_deb_scan("chan_count %d, scan_channel %d\n",
|
lbs_deb_scan("chan_count %d, scan_channel %d\n",
|
||||||
|
@ -635,16 +632,13 @@ int lbs_scan_networks(struct lbs_private *priv, int full_scan)
|
||||||
priv->scan_channel = 0;
|
priv->scan_channel = 0;
|
||||||
|
|
||||||
out:
|
out:
|
||||||
if (priv->connect_status == LBS_CONNECTED) {
|
if (priv->connect_status == LBS_CONNECTED && !priv->tx_pending_len)
|
||||||
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) &&
|
||||||
}
|
!priv->tx_pending_len)
|
||||||
if (priv->mesh_dev && (priv->mesh_connect_status == LBS_CONNECTED)) {
|
netif_wake_queue(priv->mesh_dev);
|
||||||
netif_carrier_on(priv->mesh_dev);
|
|
||||||
if (!priv->tx_pending_len)
|
|
||||||
netif_wake_queue(priv->mesh_dev);
|
|
||||||
}
|
|
||||||
kfree(chan_list);
|
kfree(chan_list);
|
||||||
|
|
||||||
lbs_deb_leave_args(LBS_DEB_SCAN, "ret %d", ret);
|
lbs_deb_leave_args(LBS_DEB_SCAN, "ret %d", ret);
|
||||||
|
|
Loading…
Reference in a new issue