---

yaml --- r: 278017 b: refs/heads/master c: ad3f78b h: refs/heads/master i: 278015: ed8239c v: v3
git-mirror · Nov 11, 2011 · 4995b90 · 4995b90
1 parent a1d3a53
commit 4995b90
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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;