From patchwork Sun Nov 9 08:55:33 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Divy Le Ray X-Patchwork-Id: 7907 X-Patchwork-Delegate: jgarzik@pobox.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id B9653DDE03 for ; Sun, 9 Nov 2008 19:55:45 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754505AbYKIIzk (ORCPT ); Sun, 9 Nov 2008 03:55:40 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754298AbYKIIzj (ORCPT ); Sun, 9 Nov 2008 03:55:39 -0500 Received: from stargate.chelsio.com ([12.22.49.110]:8402 "EHLO stargate.chelsio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754188AbYKIIzi (ORCPT ); Sun, 9 Nov 2008 03:55:38 -0500 Received: from speedy5.asicdesigners.com (speedy5.asicdesigners.com [10.192.166.133]) by stargate.chelsio.com (8.13.1/8.13.1) with ESMTP id mA98tXfh014849; Sun, 9 Nov 2008 00:55:33 -0800 Received: from [127.0.1.1] (localhost [127.0.0.1]) by speedy5.asicdesigners.com (8.14.2/8.14.2/Debian-2build1) with ESMTP id mA98tX51003586; Sun, 9 Nov 2008 00:55:33 -0800 From: Divy Le Ray Subject: [PATCH 2/2 2.6.28] cxgb3 - Limit multiqueue setting to msi-x To: jeff@garzik.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, swise@opengridcomputing.com Date: Sun, 09 Nov 2008 00:55:33 -0800 Message-ID: <20081109085533.3558.97321.stgit@speedy5> User-Agent: StGIT/0.13 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Divy Le Ray Allow multiqueue setting in MSI-X mode only Signed-off-by: Divy Le Ray --- drivers/net/cxgb3/cxgb3_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 1ace41a..f66367e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c @@ -2699,7 +2699,7 @@ static void set_nqsets(struct adapter *adap) int hwports = adap->params.nports; int nqsets = SGE_QSETS; - if (adap->params.rev > 0) { + if (adap->params.rev > 0 && adap->flags & USING_MSIX) { if (hwports == 2 && (hwports * nqsets > SGE_QSETS || num_cpus >= nqsets / hwports))