Commit b8ddafd7 authored Nov 27, 2008 by Zhu Yi Committed by John W. Linville Dec 05, 2008

ipw2200: fix netif_*_queue() removal regression

In "ipw2200: Call netif_*_queue() interfaces properly", netif_stop_queue()
and netif_wake_queue() were removed with the reason
"netif_carrier_{on,off}() handles starting and stopping packet flow into
the driver". The patch also removes a valid condition check that
ipw_tx_skb() cannot be called if device is not in STATUS_ASSOCIATED state.
But netif_carrier_off() doesn't guarantee netdev->hard_start_xmit won't
be called because linkwatch event is handled in a delayed workqueue. This
caused a kernel oops reported by Frank Seidel:
https://bugzilla.novell.com/show_bug.cgi?id=397390



This patch fixes the problem by moving the STATUS_ASSOCIATED check back
to ipw_tx_skb(). It also adds a missing netif_carrier_off() call to
ipw_disassociate().

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: Chatre, Reinette <reinette.chatre@intel.com>
Tested-by: Frank Seidel <fseidel@suse.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 40a9a829

drivers/net/wireless/ipw2200.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -3897,6 +3897,7 @@ static int ipw_disassociate(void *data)
		if (!(priv->status & (STATUS_ASSOCIATED \| STATUS_ASSOCIATING)))
		return 0;
		ipw_send_disassociate(data, 0);
		netif_carrier_off(priv->net_dev);
		return 1;
		}

		@@ -10190,6 +10191,9 @@ static int ipw_tx_skb(struct ipw_priv priv, struct ieee80211_txb txb,
		u16 remaining_bytes;
		int fc;

		if (!(priv->status & STATUS_ASSOCIATED))
		goto drop;

		hdr_len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
		switch (priv->ieee->iw_mode) {
		case IW_MODE_ADHOC: