From 09c1a2eca25c86a900e4e1f97f6914cc9c280452 Mon Sep 17 00:00:00 2001
From: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Date: Fri, 4 Nov 2011 15:48:51 +0530
Subject: [PATCH] --- yaml --- r: 278119 b: refs/heads/master c:
 a29517ce40e128bdf0794110bb4b18a984da7fb7 h: refs/heads/master i:   278117:
 77895329fa97ae31bc9255120eaba86f4a8f7b62   278115:
 e14fc9c95eec9a5d0aa1614f6dba4ad0f7c2e699   278111:
 55132937859ef90192a1be7e37610f92dd93e78c v: v3

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

diff --git a/[refs] b/[refs]
index a25a5b52a5c4..946bc3bec06d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 902b46293ba6fe2320970bbd400e3201992059d0
+refs/heads/master: a29517ce40e128bdf0794110bb4b18a984da7fb7
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/txrx.c b/trunk/drivers/net/wireless/ath/ath6kl/txrx.c
index 6f1de4468a12..d9cff2b950b1 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/txrx.c
+++ b/trunk/drivers/net/wireless/ath/ath6kl/txrx.c
@@ -266,8 +266,14 @@ int ath6kl_data_tx(struct sk_buff *skb, struct net_device *dev)
 
 	if (test_bit(WMI_ENABLED, &ar->flag)) {
 		if (skb_headroom(skb) < dev->needed_headroom) {
-			WARN_ON(1);
-			goto fail_tx;
+			struct sk_buff *tmp_skb = skb;
+
+			skb = skb_realloc_headroom(skb, dev->needed_headroom);
+			kfree_skb(tmp_skb);
+			if (skb == NULL) {
+				vif->net_stats.tx_dropped++;
+				return 0;
+			}
 		}
 
 		if (ath6kl_wmi_dix_2_dot3(ar->wmi, skb)) {