From c61f26fa609f11a471a68668b838b7366b2b75e0 Mon Sep 17 00:00:00 2001 From: Richard Knutsson Date: Mon, 4 Feb 2008 22:27:41 -0800 Subject: [PATCH] pcmcia/axnet_cs: make use of 'max()' instead of handcrafted one Use 'max(x,y)' instead of 'x < y ? y : x'. Signed-off-by: Richard Knutsson Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/net/pcmcia/axnet_cs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 9d4d7061dff8..e8a63e483a2b 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c @@ -1087,8 +1087,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, -- 2.11.0