From 3726a9f0138c3006cac8b4b9efb2a380a0deb77c Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Tue, 3 Mar 2009 19:23:36 +0200 Subject: [PATCH] --- yaml --- r: 135109 b: refs/heads/master c: ee166a0e71947e0ebeb044fd2277435f665270ac h: refs/heads/master i: 135107: cfc145d7425d043614e05bb23d200c53baa2a5e8 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath9k/main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8baa0a42e537..8d45a2cb1205 100644 --- 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 index 9b5f21493650..6d19a31934d5 100644 --- 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)); /*