lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cxgb3 - Remove BUG_ON from t3b_intr_napi

Browse Source 
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>
This commit is contained in:
Divy Le Ray
2007-01-30 19:44:18 -08:00
committed by Jeff Garzik
parent f2c6879e06
commit f2aa52086f
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/cxgb3/sge.c
View File

@@ -2199,14 +2199,12 @@ static irqreturn_t t3b_intr_napi(int irq, void *cookie)
if (likely(map & 1)) { if (likely(map & 1)) {
dev = adap->sge.qs[0].netdev; dev = adap->sge.qs[0].netdev;
BUG_ON(napi_is_scheduled(dev));
if (likely(__netif_rx_schedule_prep(dev))) if (likely(__netif_rx_schedule_prep(dev)))
__netif_rx_schedule(dev); __netif_rx_schedule(dev);
} }
if (map & 2) { if (map & 2) {
dev = adap->sge.qs[1].netdev; dev = adap->sge.qs[1].netdev;
BUG_ON(napi_is_scheduled(dev));
if (likely(__netif_rx_schedule_prep(dev))) if (likely(__netif_rx_schedule_prep(dev)))
__netif_rx_schedule(dev); __netif_rx_schedule(dev);
} }