projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6b2e438
)
pcmcia/axnet_cs: make use of 'max()' instead of handcrafted one
author
Richard Knutsson
<
[email protected]
>
Tue, 5 Feb 2008 06:27:41 +0000
(22:27 -0800)
committer
Linus Torvalds
<
[email protected]
>
Tue, 5 Feb 2008 17:44:09 +0000
(09:44 -0800)
Use 'max(x,y)' instead of 'x < y ? y : x'.
Signed-off-by: Richard Knutsson <
[email protected]
>
Acked-by: Alan Cox <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
drivers/net/pcmcia/axnet_cs.c
patch
|
blob
|
history
diff --git
a/drivers/net/pcmcia/axnet_cs.c
b/drivers/net/pcmcia/axnet_cs.c
index 9d4d7061dff8b3b84396df82656613067f8b95d7..e8a63e483a2be034f9c4a057d0b3cc8457ac645a 100644
(file)
--- 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,