---

yaml --- r: 268221 b: refs/heads/master c: 2618f3a h: refs/heads/master i: 268219: e383b5f v: v3
git-mirror · Sep 6, 2011 · 1fbd3fe · 1fbd3fe
1 parent eadbdd9
commit 1fbd3fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa188ec8b6b44d3697b96900929ac55c0a88dcf4
+refs/heads/master: 2618f3a63c968ba106832e26bf43a20dd3a119ec
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/dma.c b/trunk/drivers/staging/brcm80211/brcmsmac/dma.c
@@ -917,7 +917,7 @@ struct sk_buff *dma_rx(struct dma_pub *pub)
 		tail = head;
 		while ((resid > 0) && (p = _dma_getnextrxp(di, false))) {
 			tail->next = p;
-			pkt_len = min(resid, (int)di->rxbufsize);
+			pkt_len = min_t(uint, resid, di->rxbufsize);
 			__skb_trim(p, pkt_len);
 
 			tail = p;