---

yaml --- r: 332951 b: refs/heads/master c: 1451ae6 h: refs/heads/master i: 332949: 63cd3d8 332947: 97dc784 332943: 526c79a v: v3
git-mirror · Oct 9, 2012 · 22c2d33 · 22c2d33
1 parent d24356c
commit 22c2d33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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");