diff --git a/[refs] b/[refs] index fb38b7084812..f83f1e16df33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2c6879e062071d94d208fb22800410bf8bab294 +refs/heads/master: f2aa52086fef57506980df68b92e6bd6faef3c85 diff --git a/trunk/drivers/net/cxgb3/sge.c b/trunk/drivers/net/cxgb3/sge.c index 8b3c8246efba..daef7fd00454 100644 --- a/trunk/drivers/net/cxgb3/sge.c +++ b/trunk/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); }