summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDivy Le Ray <divy@chelsio.com>2007-01-31 04:44:18 +0100
committerJeff Garzik <jeff@garzik.org>2007-02-05 22:58:51 +0100
commitf2aa52086fef57506980df68b92e6bd6faef3c85 (patch)
tree726c59cc8ccf429a71ca6addf81358b192683681
parentcxgb3 - white space to tabs (diff)
downloadlinux-f2aa52086fef57506980df68b92e6bd6faef3c85.tar.xz
linux-f2aa52086fef57506980df68b92e6bd6faef3c85.zip
cxgb3 - Remove BUG_ON from t3b_intr_napi
In some cases, SG_DATA_INTR won't clear on read and the following interrupt may cause us to assert because NAPI is already scheduled. Remove the assertion, NAPI can handle attempts to rearm it while it's already scheduled. Signed-off-by: Divy Le Ray <divy@chelsio.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/cxgb3/sge.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index 8b3c8246efba..daef7fd00454 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -2199,14 +2199,12 @@ static irqreturn_t t3b_intr_napi(int irq, void *cookie)
if (likely(map & 1)) {
dev = adap->sge.qs[0].netdev;
- BUG_ON(napi_is_scheduled(dev));
if (likely(__netif_rx_schedule_prep(dev)))
__netif_rx_schedule(dev);
}
if (map & 2) {
dev = adap->sge.qs[1].netdev;
- BUG_ON(napi_is_scheduled(dev));
if (likely(__netif_rx_schedule_prep(dev)))
__netif_rx_schedule(dev);
}