]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
be2net: stop checking the UE registers after an EEH error
authorSathya Perla <sathya.perla@emulex.com>
Thu, 10 Nov 2011 19:17:58 +0000 (19:17 +0000)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Thu, 8 Dec 2011 23:36:11 +0000 (15:36 -0800)
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/benet/be_main.c

index 12a6edc4d0aa4b3d9c5c9433d0e89d184f43e1f3..e45a9a1bf53727888d74edf3e09b4ccce3501658 100644 (file)
@@ -1977,6 +1977,9 @@ void be_detect_dump_ue(struct be_adapter *adapter)
        u32 sliport_status = 0, sliport_err1 = 0, sliport_err2 = 0;
        u32 i;
 
+       if (adapter->eeh_err || adapter->ue_detected)
+               return;
+
        if (lancer_chip(adapter)) {
                sliport_status = ioread32(adapter->db + SLIPORT_STATUS_OFFSET);
                if (sliport_status & SLIPORT_STATUS_ERR_MASK) {
@@ -2038,8 +2041,7 @@ static void be_worker(struct work_struct *work)
        struct be_rx_obj *rxo;
        int i;
 
-       if (!adapter->ue_detected)
-               be_detect_dump_ue(adapter);
+       be_detect_dump_ue(adapter);
 
        /* when interrupts are not yet enabled, just reap any pending
        * mcc completions */