From 5ce0aa532c29fd29f9f7aa5bf7baea493dd2d8a6 Mon Sep 17 00:00:00 2001
From: Sathya Perla <sathya.perla@emulex.com>
Date: Wed, 29 Jun 2011 23:33:37 +0000
Subject: [PATCH] --- yaml --- r: 256008 b: refs/heads/master c:
 b9ab82c774d8abcca8b6c1d5f30f5912a4448980 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/benet/be_main.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7242740d6465..11a2eb927134 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 482c9e798738dea847a5e5e0d20692fe80d48a76
+refs/heads/master: b9ab82c774d8abcca8b6c1d5f30f5912a4448980
diff --git a/trunk/drivers/net/benet/be_main.c b/trunk/drivers/net/benet/be_main.c
index 5b319d78f355..696f634b7e38 100644
--- a/trunk/drivers/net/benet/be_main.c
+++ b/trunk/drivers/net/benet/be_main.c
@@ -3417,6 +3417,12 @@ static int __devinit be_probe(struct pci_dev *pdev,
 	if (status)
 		goto stats_clean;
 
+	/* The INTR bit may be set in the card when probed by a kdump kernel
+	 * after a crash.
+	 */
+	if (!lancer_chip(adapter))
+		be_intr_set(adapter, false);
+
 	be_msix_enable(adapter);
 
 	INIT_DELAYED_WORK(&adapter->work, be_worker);