Commit c61f26fa authored by Richard Knutsson's avatar Richard Knutsson Committed by Linus Torvalds

pcmcia/axnet_cs: make use of 'max()' instead of handcrafted one

Use 'max(x,y)' instead of 'x < y ? y : x'.
Signed-off-by: default avatarRichard Knutsson <ricknu-0@student.ltu.se>
Acked-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6b2e4386
...@@ -1087,7 +1087,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -1087,7 +1087,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
ei_local->irqlock = 1; 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 * We have two Tx slots available for use. Find the first free
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment