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

Commit a27b9f96 authored by David Woodhouse's avatar David Woodhouse Committed by David S. Miller
Browse files

libertas: slight cleanup of netif queue stop/wake 



In particular, we shouldn't be waking the queues in lbs_host_to_card_done()
any more.

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 23d36eec

drivers/net/wireless/libertas/cmdresp.c

+8 −6
Original line number Diff line number Diff line
@@ -43,14 +43,15 @@ void lbs_mac_event_disconnected(struct lbs_private *priv) 
	msleep_interruptible(1000);

	wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);



	/* Free Tx and Rx packets */

	kfree_skb(priv->currenttxskb);

	priv->currenttxskb = NULL;



	/* report disconnect to upper layer */

	netif_stop_queue(priv->dev);

	netif_carrier_off(priv->dev);



	/* Free Tx and Rx packets */

	kfree_skb(priv->currenttxskb);

	priv->currenttxskb = NULL;

	priv->tx_pending_len = 0;



	/* reset SNR/NF/RSSI values */

	memset(priv->SNR, 0x00, sizeof(priv->SNR));

	memset(priv->NF, 0x00, sizeof(priv->NF));
@@ -883,9 +884,10 @@ int lbs_process_event(struct lbs_private *priv) 
		}

		lbs_pr_info("EVENT: MESH_AUTO_STARTED\n");

		priv->mesh_connect_status = LBS_CONNECTED;

		if (priv->mesh_open == 1) {

			netif_wake_queue(priv->mesh_dev);

		if (priv->mesh_open) {

			netif_carrier_on(priv->mesh_dev);

			if (!priv->tx_pending_len)

				netif_wake_queue(priv->mesh_dev);

		}

		priv->mode = IW_MODE_ADHOC;

		schedule_work(&priv->sync_channel);

drivers/net/wireless/libertas/join.c

+4 −3
Original line number Diff line number Diff line
@@ -781,9 +781,9 @@ int lbs_ret_80211_associate(struct lbs_private *priv, 
	priv->numSNRNF = 0;



	netif_carrier_on(priv->dev);

	if (!priv->tx_pending_len)

		netif_wake_queue(priv->dev);





	memcpy(wrqu.ap_addr.sa_data, priv->curbssparams.bssid, ETH_ALEN);

	wrqu.ap_addr.sa_family = ARPHRD_ETHER;

	wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
@@ -865,6 +865,7 @@ int lbs_ret_80211_ad_hoc_start(struct lbs_private *priv, 
	priv->curbssparams.ssid_len = bss->ssid_len;



	netif_carrier_on(priv->dev);

	if (!priv->tx_pending_len)

		netif_wake_queue(priv->dev);



	memset(&wrqu, 0, sizeof(wrqu));

drivers/net/wireless/libertas/main.c

+1 −11
Original line number Diff line number Diff line
@@ -489,19 +489,9 @@ void lbs_host_to_card_done(struct lbs_private *priv) 
	priv->dnld_sent = DNLD_RES_RECEIVED;



	/* Wake main thread if commands are pending */

	if (!priv->cur_cmd)

	if (!priv->cur_cmd || priv->tx_pending_len > 0)

		wake_up_interruptible(&priv->waitq);



	/* Don't wake netif queues if we're in monitor mode and

	   a TX packet is already pending, or if there are commands

	   queued to be sent. */

	if (!priv->currenttxskb && list_empty(&priv->cmdpendingq)) {

		if (priv->dev && priv->connect_status == LBS_CONNECTED)

			netif_wake_queue(priv->dev);



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

			netif_wake_queue(priv->mesh_dev);

	}

	spin_unlock_irqrestore(&priv->driver_lock, flags);

}

EXPORT_SYMBOL_GPL(lbs_host_to_card_done);

drivers/net/wireless/libertas/scan.c

+7 −5
Original line number Diff line number Diff line
@@ -659,10 +659,12 @@ int lbs_scan_networks(struct lbs_private *priv, 
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 && (priv->mesh_connect_status == LBS_CONNECTED)) {

		netif_carrier_on(priv->mesh_dev);

		if (!priv->tx_pending_len)

			netif_wake_queue(priv->mesh_dev);

	}

	kfree(chan_list);