The patch titled pcmcia/axnet_cs: make use of 'max()' instead of handcrafted one has been removed from the -mm tree. Its filename was pcmcia-axnet_cs-make-use-of-max-instead-of-handcrafted-one.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: pcmcia/axnet_cs: make use of 'max()' instead of handcrafted one From: Richard Knutsson <ricknu-0@xxxxxxxxxxxxxx> Use 'max(x,y)' instead of 'x < y ? y : x'. Signed-off-by: Richard Knutsson <ricknu-0@xxxxxxxxxxxxxx> Acked-by: Alan Cox <alan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/pcmcia/axnet_cs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/net/pcmcia/axnet_cs.c~pcmcia-axnet_cs-make-use-of-max-instead-of-handcrafted-one drivers/net/pcmcia/axnet_cs.c --- a/drivers/net/pcmcia/axnet_cs.c~pcmcia-axnet_cs-make-use-of-max-instead-of-handcrafted-one +++ a/drivers/net/pcmcia/axnet_cs.c @@ -1087,8 +1087,8 @@ static int ei_start_xmit(struct sk_buff 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, _ Patches currently in -mm which might be from ricknu-0@xxxxxxxxxxxxxx are origin.patch reiserfs-complement-va_start-with-va_end.patch kernel-paramsc-remove-sparse-warning-different-signedness.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html