FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-26 20:58:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: brcm80211: replaced PKTSETLEN macro by native __skb_trim call

Browse Source 
- 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>
This commit is contained in:
Arend van Spriel 2010-11-18 20:46:44 +01:00 committed by Greg Kroah-Hartman
parent c303ecbda8
commit 2cb8ada64f
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
View File

@ -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

3
drivers/staging/brcm80211/include/linux_osl.h
View File

@ -273,10 +273,7 @@ extern void osl_dma_unmap(struct osl_info *osh, uint pa, uint size,
#define PKTNEXT(skb) (((struct sk_buff *)(skb))->next)
#define PKTSETNEXT(skb, x) \
(((struct sk_buff *)(skb))->next = (struct sk_buff *)(x))
#define PKTSETLEN(skb, len) __skb_trim((struct sk_buff *)(skb), (len))
#define PKTALLOCED(osh) (((struct osl_pubinfo *)(osh))->pktalloced)
#define PKTSETPOOL(osh, skb, x, y) do {} while (0)
#define PKTPOOL(osh, skb) false
extern void *osl_pktget(struct osl_info *osh, uint len);
extern void osl_pktfree(struct osl_info *osh, void *skb, bool send);

2
drivers/staging/brcm80211/sys/wlc_mac80211.c
View File

@ -7164,7 +7164,7 @@ wlc_recvctl(wlc_info_t *wlc, struct osl_info *osh, d11rxhdr_t *rxh, void *p)
/* mac header+body length, exclude CRC and plcp header */
len_mpdu = PKTLEN(p) - D11_PHY_HDR_LEN - DOT11_FCS_LEN;
skb_pull(p, D11_PHY_HDR_LEN);
PKTSETLEN(p, len_mpdu);
__skb_trim(p, len_mpdu);
ASSERT(!PKTNEXT(p));
ASSERT(!PKTLINK(p));

4
drivers/staging/brcm80211/util/hnddma.c
View File

@ -1003,7 +1003,7 @@ static void *BCMFASTPATH _dma_rx(dma_info_t *di)
/* set actual length */
pkt_len = min((di->rxoffset + len), di->rxbufsize);
PKTSETLEN(head, pkt_len);
__skb_trim(head, pkt_len);
resid = len - (di->rxbufsize - di->rxoffset);
/* check for single or multi-buffer rx */
@ -1012,7 +1012,7 @@ static void *BCMFASTPATH _dma_rx(dma_info_t *di)
while ((resid > 0) && (p = _dma_getnextrxp(di, false))) {
PKTSETNEXT(tail, p);
pkt_len = min(resid, (int)di->rxbufsize);
PKTSETLEN(p, pkt_len);
__skb_trim(p, pkt_len);
tail = p;
resid -= di->rxbufsize;