---

yaml --- r: 268631 b: refs/heads/master c: 7983a5a h: refs/heads/master i: 268629: d220e19 268627: 330a363 268623: e1d79cc v: v3
git-mirror · Oct 3, 2011 · 0979225 · 0979225
1 parent 432c3f2
commit 0979225
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e8eda4447d2c89bcc197f708dd09c18dce4b8ae
+refs/heads/master: 7983a5a7ff1a529a0317b8cdd9c6fab825554a7d
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/main.c b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
@@ -3358,8 +3358,6 @@ void brcms_c_init_scb(struct scb *scb)
 
 	scb->seqctl_nonqos = 0xFFFF;
 	scb->magic = SCB_MAGIC;
-	brcmu_pktq_init(&scb->scb_ampdu.txq, AMPDU_MAX_SCB_TID,
-		  AMPDU_MAX_SCB_TID * PKTQ_LEN_DEFAULT);
 }
 
 /* d11 core init

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/scb.h b/trunk/drivers/staging/brcm80211/brcmsmac/scb.h
@@ -51,7 +51,6 @@ struct scb_ampdu {
 	u8 release;		/* # of mpdus released at a time */
 	u16 min_len;		/* min mpdu len to support the density */
 	u32 max_rx_ampdu_bytes;	/* max ampdu rcv length; 8k, 16k, 32k, 64k */
-	struct pktq txq;	/* sdu transmit queue pending aggregation */
 
 	/*
 	 * This could easily be a ini[] pointer and we keep this info in wl