From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from TX2EHSOBE009.bigfish.com (tx2ehsobe004.messaging.microsoft.com [65.55.88.14]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "mail.global.frontbridge.com", Issuer "Cybertrust SureServer Standard Validation CA" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 9899D1007EC for ; Mon, 11 Apr 2011 16:38:38 +1000 (EST) From: Prabhakar Kushwaha To: Subject: [PATCH] driver/e1000e: Fix default interrupt mode select Date: Mon, 11 Apr 2011 12:08:18 +0530 Message-ID: <1302503898-22023-1-git-send-email-prabhakar@freescale.com> MIME-Version: 1.0 Content-Type: text/plain Cc: meet2prabhu@gmail.com, Prabhakar , Jin Qing List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Prabhakar e1000 default interrupt mode is MSI. No matter user select MSI or disable MSI in kernel config. Signed-off-by: Jin Qing Signed-off-by: Prabhakar Kushwaha --- Based upon git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git(branch master) drivers/net/e1000e/param.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c index a150e48..7b3bbec 100644 --- a/drivers/net/e1000e/param.c +++ b/drivers/net/e1000e/param.c @@ -390,7 +390,11 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter) .type = range_option, .name = "Interrupt Mode", .err = "defaulting to 2 (MSI-X)", +#ifdef CONFIG_PCI_MSI .def = E1000E_INT_MODE_MSIX, +#else + .def = E1000E_INT_MODE_LEGACY, +#endif .arg = { .r = { .min = MIN_INTMODE, .max = MAX_INTMODE } } }; -- 1.7.3