aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDivy Le Ray <divy@chelsio.com>2007-01-30 22:44:18 -0500
committerJeff Garzik <jeff@garzik.org>2007-02-05 16:58:51 -0500
commitf2aa52086fef57506980df68b92e6bd6faef3c85 (patch)
tree726c59cc8ccf429a71ca6addf81358b192683681 /drivers/net
parentf2c6879e062071d94d208fb22800410bf8bab294 (diff)
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>
Diffstat (limited to 'drivers/net')
-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)
2199 if (likely(map & 1)) { 2199 if (likely(map & 1)) {
2200 dev = adap->sge.qs[0].netdev; 2200 dev = adap->sge.qs[0].netdev;
2201 2201
2202 BUG_ON(napi_is_scheduled(dev));
2203 if (likely(__netif_rx_schedule_prep(dev))) 2202 if (likely(__netif_rx_schedule_prep(dev)))
2204 __netif_rx_schedule(dev); 2203 __netif_rx_schedule(dev);
2205 } 2204 }
2206 if (map & 2) { 2205 if (map & 2) {
2207 dev = adap->sge.qs[1].netdev; 2206 dev = adap->sge.qs[1].netdev;
2208 2207
2209 BUG_ON(napi_is_scheduled(dev));
2210 if (likely(__netif_rx_schedule_prep(dev))) 2208 if (likely(__netif_rx_schedule_prep(dev)))
2211 __netif_rx_schedule(dev); 2209 __netif_rx_schedule(dev);
2212 } 2210 }