Commit c61f26fa authored Feb 04, 2008 by Richard Knutsson Committed by Linus Torvalds Feb 05, 2008

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 <ricknu-0@student.ltu.se>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 6b2e4386

drivers/net/pcmcia/axnet_cs.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1087,7 +1087,7 @@ 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