From 108726fafc0cb92cbbc99f4257f6acec2649e869 Mon Sep 17 00:00:00 2001 From: Sathya Perla Date: Thu, 10 Nov 2011 19:17:58 +0000 Subject: [PATCH] --- yaml --- r: 277506 b: refs/heads/master c: 72f02485626b3e71955e54d227ede1b54021d571 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/emulex/benet/be_main.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3909c18cb83e..5d18859ec3ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30128031d71741ef7d0e32c345e3bf02aa8a0704 +refs/heads/master: 72f02485626b3e71955e54d227ede1b54021d571 diff --git a/trunk/drivers/net/ethernet/emulex/benet/be_main.c b/trunk/drivers/net/ethernet/emulex/benet/be_main.c index 83d971d8a5a3..99da07ff4510 100644 --- a/trunk/drivers/net/ethernet/emulex/benet/be_main.c +++ b/trunk/drivers/net/ethernet/emulex/benet/be_main.c @@ -1978,6 +1978,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) { @@ -2039,8 +2042,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 */