diff options
| author | Richard Knutsson <ricknu-0@student.ltu.se> | 2008-02-04 22:27:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 09:44:09 -0800 |
| commit | c61f26fa609f11a471a68668b838b7366b2b75e0 (patch) | |
| tree | 7cd3bee71ba33e71c452c8bf628479036b96799c /drivers | |
| parent | 6b2e43861b09bce857d41d47c853003be587a575 (diff) | |
| download | op-kernel-dev-c61f26fa609f11a471a68668b838b7366b2b75e0.zip op-kernel-dev-c61f26fa609f11a471a68668b838b7366b2b75e0.tar.gz | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 9d4d706..e8a63e4 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, |
