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;