From 5554ed31b1ed8013f021233622ad1f8882346ebf Mon Sep 17 00:00:00 2001
From: Yogesh Ashok Powar <yogeshp@marvell.com>
Date: Wed, 13 Jul 2011 17:42:06 +0530
Subject: [PATCH] --- yaml --- r: 258447 b: refs/heads/master c:
 16c929df0895e6f52f4a0f17683d709f5fef95d8 h: refs/heads/master i:   258445:
 55f047f41ecd80e61b9349026ef113235c3e6061   258443:
 e64e3f73e2f24426114462a223c72e053c4f54c2   258439:
 5365c612cda51db0dc8e6b0f598e6c6433704432   258431:
 8b804a15672f45386e7f68fac5414c2eb83079dd v: v3

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

diff --git a/[refs] b/[refs]
index 4538fd65f985..f5e720743172 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a865bad44984de245d20bfb7cff99993e8e8294
+refs/heads/master: 16c929df0895e6f52f4a0f17683d709f5fef95d8
diff --git a/trunk/drivers/net/wireless/mwl8k.c b/trunk/drivers/net/wireless/mwl8k.c
index aeac3cc4dbe4..a09b94509f04 100644
--- a/trunk/drivers/net/wireless/mwl8k.c
+++ b/trunk/drivers/net/wireless/mwl8k.c
@@ -1891,9 +1891,9 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb)
 
 	txpriority = index;
 
-	if (ieee80211_is_data_qos(wh->frame_control) &&
-	    skb->protocol != cpu_to_be16(ETH_P_PAE) &&
-	    sta->ht_cap.ht_supported && priv->ap_fw) {
+	if (priv->ap_fw && sta && sta->ht_cap.ht_supported
+			&& skb->protocol != cpu_to_be16(ETH_P_PAE)
+			&& ieee80211_is_data_qos(wh->frame_control)) {
 		tid = qos & 0xf;
 		mwl8k_tx_count_packet(sta, tid);
 		spin_lock(&priv->stream_lock);