From patchwork Fri Dec 2 07:11:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kumar Gala X-Patchwork-Id: 128809 X-Patchwork-Delegate: davem@davemloft.net 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.180.67]) by ozlabs.org (Postfix) with ESMTP id A4717B6F6B for ; Fri, 2 Dec 2011 18:12:13 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752080Ab1LBHMH (ORCPT ); Fri, 2 Dec 2011 02:12:07 -0500 Received: from gate.crashing.org ([63.228.1.57]:35132 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751886Ab1LBHMG (ORCPT ); Fri, 2 Dec 2011 02:12:06 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.13.8) with ESMTP id pB27Bkx4017715; Fri, 2 Dec 2011 01:11:49 -0600 From: Kumar Gala To: jeffrey.t.kirsher@intel.com Cc: jesse.brandeburg@intel.com, e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org, Prabhakar Subject: [PATCH] e1000e: Fix bug for e1000e interrupt default mode select. Date: Fri, 2 Dec 2011 01:11:46 -0600 Message-Id: <1322809906-6428-1-git-send-email-galak@kernel.crashing.org> X-Mailer: git-send-email 1.5.6.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Prabhakar If the kernel config does not have MSI enabled (CONFIG_PCI_MSI) the driver should not default to MSI interrupt mode but legacy interrupt mode. Signed-off-by: Jin Qing Signed-off-by: Prabhakar Signed-off-by: Kumar Gala --- drivers/net/ethernet/intel/e1000e/param.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c index 20e93b0..18c35c6 100644 --- a/drivers/net/ethernet/intel/e1000e/param.c +++ b/drivers/net/ethernet/intel/e1000e/param.c @@ -388,8 +388,13 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter) static struct e1000_option opt = { .type = range_option, .name = "Interrupt Mode", +#ifdef CONFIG_PCI_MSI .err = "defaulting to 2 (MSI-X)", .def = E1000E_INT_MODE_MSIX, +#else + .err = "defaulting to 0 (Legacy)", + .def = E1000E_INT_MODE_LEGACY, +#endif .arg = { .r = { .min = MIN_INTMODE, .max = MAX_INTMODE } } };