[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1322809906-6428-1-git-send-email-galak@kernel.crashing.org>
Date: Fri, 2 Dec 2011 01:11:46 -0600
From: Kumar Gala <galak@...nel.crashing.org>
To: jeffrey.t.kirsher@...el.com
Cc: jesse.brandeburg@...el.com, e1000-devel@...ts.sourceforge.net,
netdev@...r.kernel.org, Prabhakar <prabhakar@...escale.com>
Subject: [PATCH] e1000e: Fix bug for e1000e interrupt default mode select.
From: Prabhakar <prabhakar@...escale.com>
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 <b24347@...escale.com>
Signed-off-by: Prabhakar <prabhakar@...escale.com>
Signed-off-by: Kumar Gala <galak@...nel.crashing.org>
---
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 } }
};
--
1.7.3.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists