Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 659c8e52 authored by Samuel Ortiz's avatar Samuel Ortiz Committed by John W. Linville
Browse files

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: default avatarSamuel Ortiz <sameo@linux.intel.com>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5b069150

drivers/net/wireless/libertas/scan.c

+8 −14
Original line number Diff line number Diff line
@@ -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 @@ int lbs_scan_networks(struct lbs_private *priv, int full_scan) 
	priv->scan_channel = 0;



out:

	if (priv->connect_status == LBS_CONNECTED) {

		netif_carrier_on(priv->dev);

		if (!priv->tx_pending_len)

	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)) {

		netif_carrier_on(priv->mesh_dev);

		if (!priv->tx_pending_len)



	if (priv->mesh_dev && (priv->mesh_connect_status == LBS_CONNECTED) &&

	    !priv->tx_pending_len)

		netif_wake_queue(priv->mesh_dev);

	}



	kfree(chan_list);



	lbs_deb_leave_args(LBS_DEB_SCAN, "ret %d", ret);