Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757310AbZJFNYY (ORCPT ); Tue, 6 Oct 2009 09:24:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757296AbZJFNYX (ORCPT ); Tue, 6 Oct 2009 09:24:23 -0400 Received: from msr29.hinet.net ([168.95.4.129]:33901 "EHLO msr29.hinet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757216AbZJFNYW (ORCPT ); Tue, 6 Oct 2009 09:24:22 -0400 From: Thomas Chou To: netdev@vger.kernel.org Cc: thierry.reding@avionic-design.de, Nios2 development list , linux-kernel@vger.kernel.org, Thomas Chou Subject: [PATCH] ethoc: limit the number of buffers to 128 Date: Tue, 6 Oct 2009 21:25:25 +0800 Message-Id: <1254835525-2529-1-git-send-email-thomas@wytron.com.tw> X-Mailer: git-send-email 1.6.2.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1108 Lines: 31 Only 128 buffer descriptors are supported in the core. Limit the number in case we have more memory. Signed-off-by: Thomas Chou --- drivers/net/ethoc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index 6d82dc6..34d0c69 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c @@ -662,8 +662,8 @@ static int ethoc_open(struct net_device *dev) if (ret) return ret; - /* calculate the number of TX/RX buffers */ - num_bd = (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ; + /* calculate the number of TX/RX buffers, maximum 128 supported */ + num_bd = min(128, (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ); priv->num_tx = max(min_tx, num_bd / 4); priv->num_rx = num_bd - priv->num_tx; ethoc_write(priv, TX_BD_NUM, priv->num_tx); -- 1.6.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/