Patchwork driver/e1000e: Fix default interrupt mode select

login
register
mail settings
Submitter Prabhakar Kushwaha
Date April 11, 2011, 6:38 a.m.
Message ID <1302503898-22023-1-git-send-email-prabhakar@freescale.com>
Download mbox | patch
Permalink /patch/90566/
State Superseded
Headers show

Comments

Prabhakar Kushwaha - April 11, 2011, 6:38 a.m.
From: Prabhakar <prabhakar@freescale.com>

e1000 default interrupt mode is MSI. No matter user select MSI or
disable MSI in kernel config.

Signed-off-by: Jin Qing <b24347@freescale.com>
Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
---
 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(-)
Kumar Gala - April 11, 2011, 1:11 p.m.
On Apr 11, 2011, at 1:38 AM, Prabhakar Kushwaha wrote:

> From: Prabhakar <prabhakar@freescale.com>
> 
> e1000 default interrupt mode is MSI. No matter user select MSI or
> disable MSI in kernel config.
> 
> Signed-off-by: Jin Qing <b24347@freescale.com>
> Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
> ---
> 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(-)

You should send this to netdev and CC the e1000e Maintainer.

- k

Patch

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 } }
 		};