From 4995b909763c903a6b30ed62f0d72332f8536c72 Mon Sep 17 00:00:00 2001
From: Kalle Valo <kvalo@qca.qualcomm.com>
Date: Thu, 6 Oct 2011 14:32:32 +0300
Subject: [PATCH] --- yaml --- r: 278017 b: refs/heads/master c:
 ad3f78b99e5cd74e9d9643ac8356206f57e796c9 h: refs/heads/master i:   278015:
 ed8239c17e0d30d93d94494d9c08efa0b369d23d v: v3

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

diff --git a/[refs] b/[refs]
index b98182421daa..339a81859e81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e1cb23c5e3c38b25a678a8a14d7464341e8207f
+refs/heads/master: ad3f78b99e5cd74e9d9643ac8356206f57e796c9
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/txrx.c b/trunk/drivers/net/wireless/ath/ath6kl/txrx.c
index bcf7b01310d0..a9dff01c70a6 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/txrx.c
+++ b/trunk/drivers/net/wireless/ath/ath6kl/txrx.c
@@ -1247,6 +1247,11 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)
 		}
 		if (skb1)
 			ath6kl_data_tx(skb1, ar->net_dev);
+
+		if (skb == NULL) {
+			/* nothing to deliver up the stack */
+			return;
+		}
 	}
 
 	datap = (struct ethhdr *) skb->data;