From 84ef6642063edc8e2dc37152fa17f3f8efdb52f4 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Sat, 9 Jun 2012 22:51:42 +0200
Subject: [PATCH] --- yaml --- r: 314353 b: refs/heads/master c:
 5e16e8ee3a14b59366d25f075926da3ca5d03d11 h: refs/heads/master i:   314351:
 8c4180576ed0546738d2870fbccef0d0ee745d15 v: v3

---
 [refs]                                                | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index da5c833a6ee1..7bad9ab19e18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d597ee7e28d2576ab075abdebab96d3cb65f1b54
+refs/heads/master: 5e16e8ee3a14b59366d25f075926da3ca5d03d11
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c b/trunk/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
index 95b5902bc4b3..01b190a25d94 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
@@ -735,10 +735,8 @@ brcms_c_sendampdu(struct ampdu_info *ampdu, struct brcms_txq_info *qi,
 		 * a candidate for aggregation
 		 */
 		p = pktq_ppeek(&qi->q, prec);
-		/* tx_info must be checked with current p */
-		tx_info = IEEE80211_SKB_CB(p);
-
 		if (p) {
+			tx_info = IEEE80211_SKB_CB(p);
 			if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) &&
 			    ((u8) (p->priority) == tid)) {
 				plen = p->len + AMPDU_MAX_MPDU_OVERHEAD;
@@ -759,6 +757,7 @@ brcms_c_sendampdu(struct ampdu_info *ampdu, struct brcms_txq_info *qi,
 					p = NULL;
 					continue;
 				}
+				/* next packet fit for aggregation so dequeue */
 				p = brcmu_pktq_pdeq(&qi->q, prec);
 			} else {
 				p = NULL;