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

Commit 521c4d96 authored by David S. Miller's avatar David S. Miller
Browse files

ipw2200: Call netif_*_queue() interfaces properly. 



netif_carrier_{on,off}() handles starting and stopping packet
flow into the driver.  So there is no reason to invoke netif_stop_queue()
and netif_wake_queue() in response to link status events.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 42555892

drivers/net/wireless/ipw2200.c

+2 −31
Original line number Original line Diff line number Diff line
@@ -4972,8 +4972,7 @@ static int ipw_queue_tx_reclaim(struct ipw_priv *priv, 
	}

	}

      done:

      done:

	if ((ipw_tx_queue_space(q) > q->low_mark) &&

	if ((ipw_tx_queue_space(q) > q->low_mark) &&

	    (qindex >= 0) &&

	    (qindex >= 0))

	    (priv->status & STATUS_ASSOCIATED) && netif_running(priv->net_dev))

		netif_wake_queue(priv->net_dev);

		netif_wake_queue(priv->net_dev);

	used = q->first_empty - q->last_used;

	used = q->first_empty - q->last_used;

	if (used < 0)

	if (used < 0)
@@ -10154,14 +10153,8 @@ static void init_sys_config(struct ipw_sys_config *sys_config) 




static int ipw_net_open(struct net_device *dev)

static int ipw_net_open(struct net_device *dev)

{

{

	struct ipw_priv *priv = ieee80211_priv(dev);

	IPW_DEBUG_INFO("dev->open\n");

	IPW_DEBUG_INFO("dev->open\n");

	/* we should be verifying the device is ready to be opened */

	mutex_lock(&priv->mutex);

	if (!(priv->status & STATUS_RF_KILL_MASK) &&

	    (priv->status & STATUS_ASSOCIATED))

	netif_start_queue(dev);

	netif_start_queue(dev);

	mutex_unlock(&priv->mutex);

	return 0;

	return 0;

}

}
@@ -10481,13 +10474,6 @@ static int ipw_net_hard_start_xmit(struct ieee80211_txb *txb, 
	IPW_DEBUG_TX("dev->xmit(%d bytes)\n", txb->payload_size);

	IPW_DEBUG_TX("dev->xmit(%d bytes)\n", txb->payload_size);

	spin_lock_irqsave(&priv->lock, flags);

	spin_lock_irqsave(&priv->lock, flags);





	if (!(priv->status & STATUS_ASSOCIATED)) {

		IPW_DEBUG_INFO("Tx attempt while not associated.\n");

		priv->ieee->stats.tx_carrier_errors++;

		netif_stop_queue(dev);

		goto fail_unlock;

	}



#ifdef CONFIG_IPW2200_PROMISCUOUS

#ifdef CONFIG_IPW2200_PROMISCUOUS

	if (rtap_iface && netif_running(priv->prom_net_dev))

	if (rtap_iface && netif_running(priv->prom_net_dev))

		ipw_handle_promiscuous_tx(priv, txb);

		ipw_handle_promiscuous_tx(priv, txb);
@@ -10499,10 +10485,6 @@ static int ipw_net_hard_start_xmit(struct ieee80211_txb *txb, 
	spin_unlock_irqrestore(&priv->lock, flags);

	spin_unlock_irqrestore(&priv->lock, flags);





	return ret;

	return ret;



      fail_unlock:

	spin_unlock_irqrestore(&priv->lock, flags);

	return 1;

}

}





static struct net_device_stats *ipw_net_get_stats(struct net_device *dev)

static struct net_device_stats *ipw_net_get_stats(struct net_device *dev)
@@ -10703,13 +10685,6 @@ static void ipw_link_up(struct ipw_priv *priv) 
	priv->last_packet_time = 0;

	priv->last_packet_time = 0;





	netif_carrier_on(priv->net_dev);

	netif_carrier_on(priv->net_dev);

	if (netif_queue_stopped(priv->net_dev)) {

		IPW_DEBUG_NOTIF("waking queue\n");

		netif_wake_queue(priv->net_dev);

	} else {

		IPW_DEBUG_NOTIF("starting queue\n");

		netif_start_queue(priv->net_dev);

	}





	cancel_delayed_work(&priv->request_scan);

	cancel_delayed_work(&priv->request_scan);

	cancel_delayed_work(&priv->request_direct_scan);

	cancel_delayed_work(&priv->request_direct_scan);
@@ -10739,7 +10714,6 @@ static void ipw_link_down(struct ipw_priv *priv) 
{

{

	ipw_led_link_down(priv);

	ipw_led_link_down(priv);

	netif_carrier_off(priv->net_dev);

	netif_carrier_off(priv->net_dev);

	netif_stop_queue(priv->net_dev);

	notify_wx_assoc_event(priv);

	notify_wx_assoc_event(priv);





	/* Cancel any queued work ... */

	/* Cancel any queued work ... */
@@ -11419,7 +11393,6 @@ static void ipw_down(struct ipw_priv *priv) 
	/* Clear all bits but the RF Kill */

	/* Clear all bits but the RF Kill */

	priv->status &= STATUS_RF_KILL_MASK | STATUS_EXIT_PENDING;

	priv->status &= STATUS_RF_KILL_MASK | STATUS_EXIT_PENDING;

	netif_carrier_off(priv->net_dev);

	netif_carrier_off(priv->net_dev);

	netif_stop_queue(priv->net_dev);





	ipw_stop_nic(priv);

	ipw_stop_nic(priv);
@@ -11522,7 +11495,6 @@ static int ipw_prom_open(struct net_device *dev) 




	IPW_DEBUG_INFO("prom dev->open\n");

	IPW_DEBUG_INFO("prom dev->open\n");

	netif_carrier_off(dev);

	netif_carrier_off(dev);

	netif_stop_queue(dev);





	if (priv->ieee->iw_mode != IW_MODE_MONITOR) {

	if (priv->ieee->iw_mode != IW_MODE_MONITOR) {

		priv->sys_config.accept_all_data_frames = 1;

		priv->sys_config.accept_all_data_frames = 1;
@@ -11558,7 +11530,6 @@ static int ipw_prom_stop(struct net_device *dev) 
static int ipw_prom_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)

static int ipw_prom_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)

{

{

	IPW_DEBUG_INFO("prom dev->xmit\n");

	IPW_DEBUG_INFO("prom dev->xmit\n");

	netif_stop_queue(dev);

	return -EOPNOTSUPP;

	return -EOPNOTSUPP;

}

}