Skip to content

Commit

Permalink
pcmcia/axnet_cs: make use of 'max()' instead of handcrafted one
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Richard Knutsson authored and Linus Torvalds committed Feb 5, 2008
1 parent 6b2e438 commit c61f26f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/pcmcia/axnet_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit c61f26f

Please sign in to comment.