diff options
| author | Henry Ptasinski | 2011-09-01 11:16:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-09-07 01:38:48 +0200 |
| commit | 2618f3a63c968ba106832e26bf43a20dd3a119ec (patch) | |
| tree | 197355678bb342ee542693051107efe6a74e7a6d /drivers/staging/brcm80211 | |
| parent | staging: brcm80211: removed static function declarations in 3 files (diff) | |
| download | kernel-qcow2-linux-2618f3a63c968ba106832e26bf43a20dd3a119ec.tar.gz kernel-qcow2-linux-2618f3a63c968ba106832e26bf43a20dd3a119ec.tar.xz kernel-qcow2-linux-2618f3a63c968ba106832e26bf43a20dd3a119ec.zip | |
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>
Diffstat (limited to 'drivers/staging/brcm80211')
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/dma.c b/drivers/staging/brcm80211/brcmsmac/dma.c index 8859a77e6750..6d9a0feafa57 100644 --- a/drivers/staging/brcm80211/brcmsmac/dma.c +++ b/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; |