From patchwork Thu Sep 1 09:16:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Vossen X-Patchwork-Id: 1118552 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p819HdCH002620 for ; Thu, 1 Sep 2011 09:17:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752604Ab1IAJRj (ORCPT ); Thu, 1 Sep 2011 05:17:39 -0400 Received: from mms2.broadcom.com ([216.31.210.18]:1175 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750820Ab1IAJRg (ORCPT ); Thu, 1 Sep 2011 05:17:36 -0400 Received: from [10.9.200.133] by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Thu, 01 Sep 2011 02:23:17 -0700 X-Server-Uuid: D3C04415-6FA8-4F2C-93C1-920E106A2031 Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.2.247.2; Thu, 1 Sep 2011 02:17:06 -0700 Received: from mail-sj1-12.sj.broadcom.com (mail-sj1-12.sj.broadcom.com [10.17.16.106]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 28FA574D09; Thu, 1 Sep 2011 02:17:26 -0700 (PDT) Received: from LTAMS-RVOSSEN (unknown [10.176.68.25]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id EC79020508; Thu, 1 Sep 2011 02:17:22 -0700 (PDT) Received: from rvossen by LTAMS-RVOSSEN with local (Exim 4.74) ( envelope-from ) id 1Qz3Oj-0002TT-Tp; Thu, 01 Sep 2011 11:17:21 +0200 From: "Roland Vossen" To: gregkh@suse.de cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org Subject: [PATCH 09/30] staging: brcm80211: use min_t() instead of min() Date: Thu, 1 Sep 2011 11:16:59 +0200 Message-ID: <1314868640-9425-10-git-send-email-rvossen@broadcom.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1314868640-9425-1-git-send-email-rvossen@broadcom.com> References: <1314868640-9425-1-git-send-email-rvossen@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 6241908F5IS280544-01-01 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 01 Sep 2011 09:17:42 +0000 (UTC) From: Henry Ptasinski 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 Signed-off-by: Roland Vossen --- 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 8859a77..6d9a0fe 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;