---

yaml --- r: 171704 b: refs/heads/master c: 0a45da7 h: refs/heads/master v: v3
git-mirror · Nov 11, 2009 · c3ea3a4 · c3ea3a4
1 parent d9e82a9
commit c3ea3a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ca42627f3ddc0e4fc3e62d879cc35ab5beaaa8b
+refs/heads/master: 0a45da765e4bf5e8a7705266fa36e0f44787b0a1
diff --git a/trunk/drivers/net/wireless/ath/ath9k/recv.c b/trunk/drivers/net/wireless/ath/ath9k/recv.c
@@ -100,6 +100,9 @@ static bool ath9k_rx_accept(struct ath_common *common,
 	hdr = (struct ieee80211_hdr *) skb->data;
 	fc = hdr->frame_control;
 
+	if (!rx_stats->rs_datalen)
+		return false;
+
 	if (rx_stats->rs_more) {
 		/*
 		 * Frame spans multiple descriptors; this cannot happen yet
@@ -793,9 +796,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush)
 		if (flush)
 			goto requeue;
 
-		if (!rx_stats->rs_datalen)
-			goto requeue;
-
 		/* The status portion of the descriptor could get corrupted. */
 		if (sc->rx.bufsize < rx_stats->rs_datalen)
 			goto requeue;