From 97e714a2d86863b43a15e9ca9287288664319df4 Mon Sep 17 00:00:00 2001
From: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Date: Thu, 26 Apr 2012 20:26:13 +0530
Subject: [PATCH] --- yaml --- r: 306740 b: refs/heads/master c:
 1881ced5963520154aebb616ad7b2ff9c2c7f012 h: refs/heads/master v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/net/wireless/ath/ath6kl/txrx.c | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 77c5bdc5ea29..b85895cd003b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 096797abbd93730c98ce765a6fe0abee3afaa782
+refs/heads/master: 1881ced5963520154aebb616ad7b2ff9c2c7f012
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/txrx.c b/trunk/drivers/net/wireless/ath/ath6kl/txrx.c
index 82f2f5cb475b..67206aedea6c 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/txrx.c
+++ b/trunk/drivers/net/wireless/ath/ath6kl/txrx.c
@@ -362,15 +362,11 @@ int ath6kl_data_tx(struct sk_buff *skb, struct net_device *dev)
 		   skb, skb->data, skb->len);
 
 	/* If target is not associated */
-	if (!test_bit(CONNECTED, &vif->flags)) {
-		dev_kfree_skb(skb);
-		return 0;
-	}
+	if (!test_bit(CONNECTED, &vif->flags))
+		goto fail_tx;
 
-	if (WARN_ON_ONCE(ar->state != ATH6KL_STATE_ON)) {
-		dev_kfree_skb(skb);
-		return 0;
-	}
+	if (WARN_ON_ONCE(ar->state != ATH6KL_STATE_ON))
+		goto fail_tx;
 
 	if (!test_bit(WMI_READY, &ar->flag))
 		goto fail_tx;