cxgb3 - Remove BUG_ON from t3b_intr_napi
authorDivy Le Ray <divy@chelsio.com>
Wed, 31 Jan 2007 03:44:18 +0000 (19:44 -0800)
committerJeff Garzik <jeff@garzik.org>
Mon, 5 Feb 2007 21:58:51 +0000 (16:58 -0500)
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>
drivers/net/cxgb3/sge.c

index 8b3c8246efba5d23ddbb126a156ac1526baf4e10..daef7fd00454417894b87bae0a7a646e9cff1b1f 100644 (file)
@@ -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);
        }