---

yaml --- r: 228138 b: refs/heads/master c: 2cb8ada h: refs/heads/master v: v3
git-mirror · Nov 20, 2010 · 73977c6 · 73977c6
1 parent 652806d
commit 73977c6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c303ecbda8b7c86975c4ba23f56b8cbe297cd060
+refs/heads/master: 2cb8ada64f209c5c033f1821bbbc0e8d388cbf7f
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/trunk/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 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
 					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 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
 		}
 
 		/* Fill in packet len and prio, deliver upward */
-		PKTSETLEN(pkt, len);
+		__skb_trim(pkt, len);
 		skb_pull(pkt, doff);
 
 #ifdef SDTEST

diff --git a/trunk/drivers/staging/brcm80211/include/linux_osl.h b/trunk/drivers/staging/brcm80211/include/linux_osl.h
@@ -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);
 

diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -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));

diff --git a/trunk/drivers/staging/brcm80211/util/hnddma.c b/trunk/drivers/staging/brcm80211/util/hnddma.c
@@ -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;