From 097922590ec4d2c052a197dc39e99605e11bc931 Mon Sep 17 00:00:00 2001 From: Roland Vossen Date: Sun, 2 Oct 2011 10:14:27 -0700 Subject: [PATCH] --- yaml --- r: 268631 b: refs/heads/master c: 7983a5a7ff1a529a0317b8cdd9c6fab825554a7d h: refs/heads/master i: 268629: d220e1973d8f67100377884b242c40263f3b684b 268627: 330a3638052af218b0506e65aced4005c2463af8 268623: e1d79cc276ad24568d979de737e6945a8f777ae2 v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/main.c | 2 -- trunk/drivers/staging/brcm80211/brcmsmac/scb.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2e01f403f375..967cd61614de 100644 --- 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 index 4f79a42604e3..e6bd3cf3cd33 100644 --- 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 index 122d3c36f0c7..51c79c7239b7 100644 --- 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