[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.25 / patches.fixes / ipw2200-send-noassoc.patch

From: Zhu Yi <yi.zhu@intel.com>
Subject: ipw2200: fix oops in ipw_tx_skb
Patch-mainline: not yet
References: bnc#397390

Fixes Oops in ipw2200:ipw_tx_skb when pinging through
a WPA enterprise connection.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Tested-by: Frank Seidel <fseidel@suse.de>
Signed-off-by: Ffrank Seidel <fseidel@suse.de>

---
 drivers/net/wireless/ipw2200.c |    5 +++++
 1 file changed, 5 insertions(+)

--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -10206,6 +10206,11 @@ static int ipw_tx_skb(struct ipw_priv *p
 	u16 remaining_bytes;
 	int fc;
 
+	if (!(priv->status & STATUS_ASSOCIATED)) {
+		IPW_DEBUG_TX("Tx attempt while not associated.\n");
+		goto drop;
+	}
+
 	hdr_len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
 	switch (priv->ieee->iw_mode) {
 	case IW_MODE_ADHOC:
Commit	Line	Data
00e5a55c BS	1	From: Zhu Yi <yi.zhu@intel.com>
	2	Subject: ipw2200: fix oops in ipw_tx_skb
	3	Patch-mainline: not yet
	4	References: bnc#397390
	5
	6	Fixes Oops in ipw2200:ipw_tx_skb when pinging through
	7	a WPA enterprise connection.
	8
	9	Signed-off-by: Zhu Yi <yi.zhu@intel.com>
	10	Tested-by: Frank Seidel <fseidel@suse.de>
	11	Signed-off-by: Ffrank Seidel <fseidel@suse.de>
	12
	13	---
	14	drivers/net/wireless/ipw2200.c \| 5 +++++
	15	1 file changed, 5 insertions(+)
	16
	17	--- a/drivers/net/wireless/ipw2200.c
	18	+++ b/drivers/net/wireless/ipw2200.c
	19	@@ -10206,6 +10206,11 @@ static int ipw_tx_skb(struct ipw_priv *p
	20	u16 remaining_bytes;
	21	int fc;
	22
	23	+ if (!(priv->status & STATUS_ASSOCIATED)) {
	24	+ IPW_DEBUG_TX("Tx attempt while not associated.\n");
	25	+ goto drop;
	26	+ }
	27	+
	28	hdr_len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
	29	switch (priv->ieee->iw_mode) {
	30	case IW_MODE_ADHOC: