diff --git a/[refs] b/[refs]
index 770030e5304e..07bfe4863067 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b78ac9bfc7483ba4bda9ad3d10dd4afcf88337c
+refs/heads/master: 499fe9a419d43410be576bcc825658997b6ce822
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 5c1930ba8ebe..aa5cc37b4921 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -612,7 +612,8 @@ static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw,
 				skipped++;
 				continue;
 			}
-			if (!time_after(jiffies, tid_agg_rx->reorder_time[j] +
+			if (skipped &&
+			    !time_after(jiffies, tid_agg_rx->reorder_time[j] +
 					HT_RX_REORDER_BUF_TIMEOUT))
 				goto set_release_timer;