aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/brcm80211/brcmfmac
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2010-11-18 20:46:44 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-11-19 17:06:14 -0800
commit2cb8ada64f209c5c033f1821bbbc0e8d388cbf7f (patch)
tree5a3aa28e24effd9d1755a510307cd7ed2e89b88d /drivers/staging/brcm80211/brcmfmac
parentc303ecbda8b7c86975c4ba23f56b8cbe297cd060 (diff)
staging: brcm80211: replaced PKTSETLEN macro by native __skb_trim call
- removed PKTSETLEN macro and used __skb_trim call instead. - removed unused macros PKTSETPOOL and PKTPOOL Reviewed-by: Henry Ptasinski <henryp@broadcom.com> Reviewed-by: Brett Rudley <brudley@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmfmac')
-rw-r--r--drivers/staging/brcm80211/brcmfmac/dhd_sdio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index db649a03893..d94b11a3271 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -366,7 +366,7 @@ extern void bcmsdh_enable_hw_oob_intr(void *sdh, bool enable);
ASSERT(PKTLEN((p)) >= ((len) + datalign)); \
if (datalign) \
skb_pull((p), datalign); \
- PKTSETLEN((p), (len)); \
+ __skb_trim((p), (len)); \
} while (0)
/* Limit on rounding up frames */
@@ -3521,7 +3521,7 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
prhex("Rx Subframe Data", dptr, dlen);
#endif
- PKTSETLEN(pfirst, sublen);
+ __skb_trim(pfirst, sublen);
skb_pull(pfirst, doff);
if (PKTLEN(pfirst) == 0) {
@@ -4151,7 +4151,7 @@ deliver:
prhex("Glom Data", PKTDATA(pkt), len);
}
#endif
- PKTSETLEN(pkt, len);
+ __skb_trim(pkt, len);
ASSERT(doff == SDPCM_HDRLEN);
skb_pull(pkt, SDPCM_HDRLEN);
bus->glomd = pkt;
@@ -4164,7 +4164,7 @@ deliver:
}
/* Fill in packet len and prio, deliver upward */
- PKTSETLEN(pkt, len);
+ __skb_trim(pkt, len);
skb_pull(pkt, doff);
#ifdef SDTEST