mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-18 15:09:53 +00:00
dnet: replace obsolete *netif_rx_* functions with *napi_*
*netif_rx_* functions is obsolete and removed in newer kernels so we need to use corresponding *napi_* functions instead. Signed-off-by: Ilya Yanok <yanok@emcraft.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
6b7c5b947c
commit
9fae6c3f64
@ -408,7 +408,7 @@ static int dnet_poll(struct napi_struct *napi, int budget)
|
||||
* packets waiting
|
||||
*/
|
||||
if (!(dnet_readl(bp, RX_FIFO_WCNT) >> 16)) {
|
||||
netif_rx_complete(napi);
|
||||
napi_complete(napi);
|
||||
int_enable = dnet_readl(bp, INTR_ENB);
|
||||
int_enable |= DNET_INTR_SRC_RX_CMDFIFOAF;
|
||||
dnet_writel(bp, int_enable, INTR_ENB);
|
||||
@ -447,7 +447,7 @@ static int dnet_poll(struct napi_struct *napi, int budget)
|
||||
if (npackets < budget) {
|
||||
/* We processed all packets available. Tell NAPI it can
|
||||
* stop polling then re-enable rx interrupts */
|
||||
netif_rx_complete(napi);
|
||||
napi_complete(napi);
|
||||
int_enable = dnet_readl(bp, INTR_ENB);
|
||||
int_enable |= DNET_INTR_SRC_RX_CMDFIFOAF;
|
||||
dnet_writel(bp, int_enable, INTR_ENB);
|
||||
@ -507,7 +507,7 @@ static irqreturn_t dnet_interrupt(int irq, void *dev_id)
|
||||
}
|
||||
|
||||
if (int_current & DNET_INTR_SRC_RX_CMDFIFOAF) {
|
||||
if (netif_rx_schedule_prep(&bp->napi)) {
|
||||
if (napi_schedule_prep(&bp->napi)) {
|
||||
/*
|
||||
* There's no point taking any more interrupts
|
||||
* until we have processed the buffers
|
||||
@ -516,7 +516,7 @@ static irqreturn_t dnet_interrupt(int irq, void *dev_id)
|
||||
int_enable = dnet_readl(bp, INTR_ENB);
|
||||
int_enable &= ~DNET_INTR_SRC_RX_CMDFIFOAF;
|
||||
dnet_writel(bp, int_enable, INTR_ENB);
|
||||
__netif_rx_schedule(&bp->napi);
|
||||
__napi_schedule(&bp->napi);
|
||||
}
|
||||
handled = 1;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user