diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-01-19 19:43:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-21 17:33:50 -0500 |
commit | 288379f050284087578b77e04f040b57db3db3f8 (patch) | |
tree | ac5f5c83e2778a1966327d87316fc94067363b45 /drivers/net/igb/igb_main.c | |
parent | 627af770c63acddc2402dd19fec70df5c3ad8ab7 (diff) |
net: Remove redundant NAPI functions
Following the removal of the unused struct net_device * parameter from
the NAPI functions named *netif_rx_* in commit 908a7a1, they are
exactly equivalent to the corresponding *napi_* functions and are
therefore redundant.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb/igb_main.c')
-rw-r--r-- | drivers/net/igb/igb_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index b82b0fb2056c..3806bb9d8bfa 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -3386,8 +3386,8 @@ static irqreturn_t igb_msix_rx(int irq, void *data) | |||
3386 | 3386 | ||
3387 | igb_write_itr(rx_ring); | 3387 | igb_write_itr(rx_ring); |
3388 | 3388 | ||
3389 | if (netif_rx_schedule_prep(&rx_ring->napi)) | 3389 | if (napi_schedule_prep(&rx_ring->napi)) |
3390 | __netif_rx_schedule(&rx_ring->napi); | 3390 | __napi_schedule(&rx_ring->napi); |
3391 | 3391 | ||
3392 | #ifdef CONFIG_IGB_DCA | 3392 | #ifdef CONFIG_IGB_DCA |
3393 | if (rx_ring->adapter->flags & IGB_FLAG_DCA_ENABLED) | 3393 | if (rx_ring->adapter->flags & IGB_FLAG_DCA_ENABLED) |
@@ -3539,7 +3539,7 @@ static irqreturn_t igb_intr_msi(int irq, void *data) | |||
3539 | mod_timer(&adapter->watchdog_timer, jiffies + 1); | 3539 | mod_timer(&adapter->watchdog_timer, jiffies + 1); |
3540 | } | 3540 | } |
3541 | 3541 | ||
3542 | netif_rx_schedule(&adapter->rx_ring[0].napi); | 3542 | napi_schedule(&adapter->rx_ring[0].napi); |
3543 | 3543 | ||
3544 | return IRQ_HANDLED; | 3544 | return IRQ_HANDLED; |
3545 | } | 3545 | } |
@@ -3577,7 +3577,7 @@ static irqreturn_t igb_intr(int irq, void *data) | |||
3577 | mod_timer(&adapter->watchdog_timer, jiffies + 1); | 3577 | mod_timer(&adapter->watchdog_timer, jiffies + 1); |
3578 | } | 3578 | } |
3579 | 3579 | ||
3580 | netif_rx_schedule(&adapter->rx_ring[0].napi); | 3580 | napi_schedule(&adapter->rx_ring[0].napi); |
3581 | 3581 | ||
3582 | return IRQ_HANDLED; | 3582 | return IRQ_HANDLED; |
3583 | } | 3583 | } |
@@ -3612,7 +3612,7 @@ static int igb_poll(struct napi_struct *napi, int budget) | |||
3612 | !netif_running(netdev)) { | 3612 | !netif_running(netdev)) { |
3613 | if (adapter->itr_setting & 3) | 3613 | if (adapter->itr_setting & 3) |
3614 | igb_set_itr(adapter); | 3614 | igb_set_itr(adapter); |
3615 | netif_rx_complete(napi); | 3615 | napi_complete(napi); |
3616 | if (!test_bit(__IGB_DOWN, &adapter->state)) | 3616 | if (!test_bit(__IGB_DOWN, &adapter->state)) |
3617 | igb_irq_enable(adapter); | 3617 | igb_irq_enable(adapter); |
3618 | return 0; | 3618 | return 0; |
@@ -3638,7 +3638,7 @@ static int igb_clean_rx_ring_msix(struct napi_struct *napi, int budget) | |||
3638 | 3638 | ||
3639 | /* If not enough Rx work done, exit the polling mode */ | 3639 | /* If not enough Rx work done, exit the polling mode */ |
3640 | if ((work_done == 0) || !netif_running(netdev)) { | 3640 | if ((work_done == 0) || !netif_running(netdev)) { |
3641 | netif_rx_complete(napi); | 3641 | napi_complete(napi); |
3642 | 3642 | ||
3643 | if (adapter->itr_setting & 3) { | 3643 | if (adapter->itr_setting & 3) { |
3644 | if (adapter->num_rx_queues == 1) | 3644 | if (adapter->num_rx_queues == 1) |