---

yaml --- r: 135109 b: refs/heads/master c: ee166a0 h: refs/heads/master i: 135107: cfc145d v: v3
git-mirror · Mar 5, 2009 · 3726a9f · 3726a9f
1 parent 1d783e7
commit 3726a9f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18eb62f87a8d1dc6ed8a01a52e6b2b1600802608
+refs/heads/master: ee166a0e71947e0ebeb044fd2277435f665270ac
diff --git a/trunk/drivers/net/wireless/ath9k/main.c b/trunk/drivers/net/wireless/ath9k/main.c
@@ -2077,6 +2077,12 @@ static int ath9k_tx(struct ieee80211_hw *hw,
 	struct ath_tx_control txctl;
 	int hdrlen, padsize;
 
+	if (aphy->state != ATH_WIPHY_ACTIVE) {
+		printk(KERN_DEBUG "ath9k: %s: TX in unexpected wiphy state "
+		       "%d\n", wiphy_name(hw->wiphy), aphy->state);
+		goto exit;
+	}
+
 	memset(&txctl, 0, sizeof(struct ath_tx_control));
 
 	/*