From 22c2d33f4796f1c2497496b5390d6edcafd18d53 Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde@emulex.com>
Date: Mon, 8 Oct 2012 18:18:21 +0000
Subject: [PATCH] --- yaml --- r: 332951 b: refs/heads/master c:
 1451ae6ef8bff77007338b2870bb3de2658afff8 h: refs/heads/master i:   332949:
 63cd3d8d313b76c700e558b555b1446a4fc9e463   332947:
 97dc784843ad2ee17e633d9c370ae9768eb4cb5c   332943:
 526c79a9d1969bcd5364b2bd53ccaeb45f599c2e v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/ethernet/emulex/benet/be_main.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fbae2b606a62..e1b659e4a46b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f796579848f284705cef8c9348f8178b37e1abe
+refs/heads/master: 1451ae6ef8bff77007338b2870bb3de2658afff8
diff --git a/trunk/drivers/net/ethernet/emulex/benet/be_main.c b/trunk/drivers/net/ethernet/emulex/benet/be_main.c
index eb3f2cb3b93b..d1b6cc587639 100644
--- a/trunk/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/trunk/drivers/net/ethernet/emulex/benet/be_main.c
@@ -2129,8 +2129,11 @@ void be_detect_error(struct be_adapter *adapter)
 		ue_hi = (ue_hi & ~ue_hi_mask);
 	}
 
-	if (ue_lo || ue_hi ||
-		sliport_status & SLIPORT_STATUS_ERR_MASK) {
+	/* On certain platforms BE hardware can indicate spurious UEs.
+	 * Allow the h/w to stop working completely in case of a real UE.
+	 * Hence not setting the hw_error for UE detection.
+	 */
+	if (sliport_status & SLIPORT_STATUS_ERR_MASK) {
 		adapter->hw_error = true;
 		dev_err(&adapter->pdev->dev,
 			"Error detected in the card\n");