---

yaml --- r: 82993 b: refs/heads/master c: c61f26f h: refs/heads/master i: 82991: 3823262 v: v3
git-mirror · Feb 5, 2008 · 9efe591 · 9efe591
1 parent 72844ca
commit 9efe591
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b2e43861b09bce857d41d47c853003be587a575
+refs/heads/master: c61f26fa609f11a471a68668b838b7366b2b75e0
diff --git a/trunk/drivers/net/pcmcia/axnet_cs.c b/trunk/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,