From 196e56c04509d8bf0a76f6386d1d4efe44e66f51 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 8 May 2008 01:43:59 +0200
Subject: [PATCH] --- yaml --- r: 96557 b: refs/heads/master c:
 dbabad0c9c026dea3ba803cbd9d768cdffc68e32 h: refs/heads/master i:   96555:
 65576515e156024c4b5c56111476135e02defa9d v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/zd1211rw/zd_usb.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a871b8ef3e63..5688fa0a5b80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d6936e2ea82ebcbdd12d489b7b5ccf430de52f1
+refs/heads/master: dbabad0c9c026dea3ba803cbd9d768cdffc68e32
diff --git a/trunk/drivers/net/wireless/zd1211rw/zd_usb.c b/trunk/drivers/net/wireless/zd1211rw/zd_usb.c
index 5316074f39f0..12e24f04dddf 100644
--- a/trunk/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/trunk/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -889,9 +889,13 @@ static void tx_urb_complete(struct urb *urb)
 	}
 free_urb:
 	skb = (struct sk_buff *)urb->context;
-	zd_mac_tx_to_dev(skb, urb->status);
+	/*
+	 * grab 'usb' pointer before handing off the skb (since
+	 * it might be freed by zd_mac_tx_to_dev or mac80211)
+	 */
 	cb = (struct zd_tx_skb_control_block *)skb->cb;
 	usb = &zd_hw_mac(cb->hw)->chip.usb;
+	zd_mac_tx_to_dev(skb, urb->status);
 	free_tx_urb(usb, urb);
 	tx_dec_submitted_urbs(usb);
 	return;