diff --git a/[refs] b/[refs] index b6c1bf8a423d..2baeac8c4656 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1782199f96eab4ad28c0334f27eb5a52b6c62428 +refs/heads/master: c1f46a001fd878f1be4e08ce1df2d5677e335926 diff --git a/trunk/drivers/staging/sxg/sxg.c b/trunk/drivers/staging/sxg/sxg.c index 287edb7b86f1..5d31e1bd9718 100644 --- a/trunk/drivers/staging/sxg/sxg.c +++ b/trunk/drivers/staging/sxg/sxg.c @@ -1268,8 +1268,8 @@ static void sxg_interrupt(struct adapter_t *adapter) { WRITE_REG(adapter->UcodeRegs[0].Icr, SXG_ICR(0, SXG_ICR_MASK), TRUE); - if (netif_rx_schedule_prep(&adapter->napi)) { - __netif_rx_schedule(&adapter->napi); + if (napi_schedule_prep(&adapter->napi)) { + __napi_schedule(&adapter->napi); } } @@ -1322,7 +1322,7 @@ static int sxg_poll(struct napi_struct *napi, int budget) sxg_handle_interrupt(adapter, &work_done, budget); if (work_done < budget) { - netif_rx_complete(napi); + napi_complete(napi); WRITE_REG(adapter->UcodeRegs[0].Isr, 0, TRUE); } return work_done;