From patchwork Mon Nov 17 20:58:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 411805 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 78DE914012B for ; Tue, 18 Nov 2014 07:58:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752830AbaKQU6o (ORCPT ); Mon, 17 Nov 2014 15:58:44 -0500 Received: from mailrelay012.isp.belgacom.be ([195.238.6.179]:50750 "EHLO mailrelay012.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752001AbaKQU6n (ORCPT ); Mon, 17 Nov 2014 15:58:43 -0500 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Aq4SAK5galRXQyyZ/2dsb2JhbABbgw6BLrhwBQF1mg8EAoEbFwEBAQEBfYQwLyOBGjeIRQHCYZBJhj6KAGQdhDUFnkyNEologUcBgjU8MIEGgUUBAQE Received: from 153.44-67-87.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([87.67.44.153]) by relay.skynet.be with ESMTP; 17 Nov 2014 21:58:40 +0100 From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Fabian Frederick , Gerrit Renker , "David S. Miller" , dccp@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 1/1 net-next] dccp: replace min/casting by min_t Date: Mon, 17 Nov 2014 21:58:37 +0100 Message-Id: <1416257917-7041-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 1.9.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Fabian Frederick --- net/dccp/ackvec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c index ba07824..bd9e718 100644 --- a/net/dccp/ackvec.c +++ b/net/dccp/ackvec.c @@ -218,7 +218,7 @@ static void dccp_ackvec_add_new(struct dccp_ackvec *av, u32 num_packets, * different underlying data structure. */ for (num_packets = num_cells = 1; lost_packets; ++num_cells) { - u8 len = min(lost_packets, (u32)DCCPAV_MAX_RUNLEN); + u8 len = min_t(u32, lost_packets, DCCPAV_MAX_RUNLEN); av->av_buf_head = __ackvec_idx_sub(av->av_buf_head, 1); av->av_buf[av->av_buf_head] = DCCPAV_NOT_RECEIVED | len;