From 9efe591f4b2677603471814777f4492105d86205 Mon Sep 17 00:00:00 2001 From: Richard Knutsson Date: Mon, 4 Feb 2008 22:27:41 -0800 Subject: [PATCH] --- yaml --- r: 82993 b: refs/heads/master c: c61f26fa609f11a471a68668b838b7366b2b75e0 h: refs/heads/master i: 82991: 38232629e6c4627280e504f3cae32da35ecdd7d2 v: v3 --- [refs] | 2 +- trunk/drivers/net/pcmcia/axnet_cs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 07d758f33bc8..5e336f81deb9 100644 --- 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 index 9d4d7061dff8..e8a63e483a2b 100644 --- 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,