Commit 2618f3a6 authored Sep 01, 2011 by Henry Ptasinski Committed by Greg Kroah-Hartman Sep 06, 2011

staging: brcm80211: use min_t() instead of min()



Also eliminate a cast to int that could cause issues with very large values
of di->rxbufsize (as suggested by Dan Carpenter).

Signed-off-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent fa188ec8

drivers/staging/brcm80211/brcmsmac/dma.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message