From 099eaaf0ebbb7bd9abbb8b44dc2803992974ac96 Mon Sep 17 00:00:00 2001 From: Don Skidmore Date: Thu, 4 Aug 2011 02:07:48 +0000 Subject: [PATCH] --- yaml --- r: 266213 b: refs/heads/master c: 0ccb974df5ac5f721491c1f07154450168b6fd0a h: refs/heads/master i: 266211: 544354d21fa8f73f7b40d4abbf3c4c4b292c02e3 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 858f1dd74802..84f4fa23a222 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3df98ec9e8ed127456a601f99619c88e9d6017f +refs/heads/master: 0ccb974df5ac5f721491c1f07154450168b6fd0a diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 3f5c5a4291a6..9cd44adcea14 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -2175,8 +2175,12 @@ static irqreturn_t ixgbe_intr(int irq, void *data) switch (hw->mac.type) { case ixgbe_mac_82599EB: - case ixgbe_mac_X540: ixgbe_check_sfp_event(adapter, eicr); + /* Fall through */ + case ixgbe_mac_X540: + if (eicr & IXGBE_EICR_ECC) + e_info(link, "Received unrecoverable ECC err, please " + "reboot\n"); ixgbe_check_overtemp_event(adapter, eicr); break; default: