Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753943AbXLKEd6 (ORCPT ); Mon, 10 Dec 2007 23:33:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752826AbXLKEdF (ORCPT ); Mon, 10 Dec 2007 23:33:05 -0500 Received: from gepetto.dc.ltu.se ([130.240.42.40]:39776 "EHLO gepetto.dc.ltu.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752603AbXLKEdD (ORCPT ); Mon, 10 Dec 2007 23:33:03 -0500 Date: Tue, 11 Dec 2007 05:32:54 +0100 (MET) From: Richard Knutsson To: linux-pcmcia@lists.infradead.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Richard Knutsson Message-Id: <20071211043428.28518.24891.sendpatchset@thinktank.campus.ltu.se> In-Reply-To: <20071211043412.28518.40867.sendpatchset@thinktank.campus.ltu.se> References: <20071211043412.28518.40867.sendpatchset@thinktank.campus.ltu.se> Subject: [PATCH 4/6] pcmcia/axnet_cs: Make use of 'max()' instead of handcrafted one Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 887 Lines: 26 Use 'max(x,y)' instead of 'x < y ? y : x'. Signed-off-by: Richard Knutsson --- diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 8d910a3..96931cc 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c @@ -1091,8 +1091,8 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev) ei_local->irqlock = 1; - send_length = ETH_ZLEN < length ? length : ETH_ZLEN; - + send_length = max(length, ETH_ZLEN); + /* * We have two Tx slots available for use. Find the first free * slot, and then perform some sanity checks. With two Tx bufs, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/