From 1fbd3fe6355592ace7b0fffa623878e8fdd02d4e Mon Sep 17 00:00:00 2001
From: Henry Ptasinski <henryp@broadcom.com>
Date: Thu, 1 Sep 2011 11:16:59 +0200
Subject: [PATCH] --- yaml --- r: 268221 b: refs/heads/master c:
 2618f3a63c968ba106832e26bf43a20dd3a119ec h: refs/heads/master i:   268219:
 e383b5ff9c74d284425d213661a107a89143ace1 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/staging/brcm80211/brcmsmac/dma.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 050cd4ddb244..94279ef1528b 100644
--- 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
index 8859a77e6750..6d9a0feafa57 100644
--- 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;