From d5fb27e9f07687706a6a9f33564709b73773cb07 Mon Sep 17 00:00:00 2001 From: Casey Leedom Date: Thu, 2 Sep 2010 13:07:31 +0000 Subject: [PATCH] --- yaml --- r: 214292 b: refs/heads/master c: aa476321022ac6c3cb8ebfd1736555ccf61da276 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/cxgb3/t3_hw.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1e5ec4c8ee73..f1f8d4ef1b4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e05e6a397c65ac9a31ce799cf85157f2d85f45b7 +refs/heads/master: aa476321022ac6c3cb8ebfd1736555ccf61da276 diff --git a/trunk/drivers/net/cxgb3/t3_hw.c b/trunk/drivers/net/cxgb3/t3_hw.c index 14a56640dfa9..d307c9de59fb 100644 --- a/trunk/drivers/net/cxgb3/t3_hw.c +++ b/trunk/drivers/net/cxgb3/t3_hw.c @@ -1408,6 +1408,7 @@ static int t3_handle_intr_status(struct adapter *adapter, unsigned int reg, fatal++; CH_ALERT(adapter, "%s (0x%x)\n", acts->msg, status & acts->mask); + status &= ~acts->mask; } else if (acts->msg) CH_WARN(adapter, "%s (0x%x)\n", acts->msg, status & acts->mask); @@ -1843,11 +1844,10 @@ static int mac_intr_handler(struct adapter *adap, unsigned int idx) t3_os_link_fault_handler(adap, idx); } - t3_write_reg(adap, A_XGM_INT_CAUSE + mac->offset, cause); - if (cause & XGM_INTR_FATAL) t3_fatal_err(adap); + t3_write_reg(adap, A_XGM_INT_CAUSE + mac->offset, cause); return cause != 0; }