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/e1000e/netdev.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/e1000e/netdev.c')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 91817d0afcaf..ff5b66adfc42 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -1179,12 +1179,12 @@ static irqreturn_t e1000_intr_msi(int irq, void *data) | |||
1179 | mod_timer(&adapter->watchdog_timer, jiffies + 1); | 1179 | mod_timer(&adapter->watchdog_timer, jiffies + 1); |
1180 | } | 1180 | } |
1181 | 1181 | ||
1182 | if (netif_rx_schedule_prep(&adapter->napi)) { | 1182 | if (napi_schedule_prep(&adapter->napi)) { |
1183 | adapter->total_tx_bytes = 0; | 1183 | adapter->total_tx_bytes = 0; |
1184 | adapter->total_tx_packets = 0; | 1184 | adapter->total_tx_packets = 0; |
1185 | adapter->total_rx_bytes = 0; | 1185 | adapter->total_rx_bytes = 0; |
1186 | adapter->total_rx_packets = 0; | 1186 | adapter->total_rx_packets = 0; |
1187 | __netif_rx_schedule(&adapter->napi); | 1187 | __napi_schedule(&adapter->napi); |
1188 | } | 1188 | } |
1189 | 1189 | ||
1190 | return IRQ_HANDLED; | 1190 | return IRQ_HANDLED; |
@@ -1246,12 +1246,12 @@ static irqreturn_t e1000_intr(int irq, void *data) | |||
1246 | mod_timer(&adapter->watchdog_timer, jiffies + 1); | 1246 | mod_timer(&adapter->watchdog_timer, jiffies + 1); |
1247 | } | 1247 | } |
1248 | 1248 | ||
1249 | if (netif_rx_schedule_prep(&adapter->napi)) { | 1249 | if (napi_schedule_prep(&adapter->napi)) { |
1250 | adapter->total_tx_bytes = 0; | 1250 | adapter->total_tx_bytes = 0; |
1251 | adapter->total_tx_packets = 0; | 1251 | adapter->total_tx_packets = 0; |
1252 | adapter->total_rx_bytes = 0; | 1252 | adapter->total_rx_bytes = 0; |
1253 | adapter->total_rx_packets = 0; | 1253 | adapter->total_rx_packets = 0; |
1254 | __netif_rx_schedule(&adapter->napi); | 1254 | __napi_schedule(&adapter->napi); |
1255 | } | 1255 | } |
1256 | 1256 | ||
1257 | return IRQ_HANDLED; | 1257 | return IRQ_HANDLED; |
@@ -1320,10 +1320,10 @@ static irqreturn_t e1000_intr_msix_rx(int irq, void *data) | |||
1320 | adapter->rx_ring->set_itr = 0; | 1320 | adapter->rx_ring->set_itr = 0; |
1321 | } | 1321 | } |
1322 | 1322 | ||
1323 | if (netif_rx_schedule_prep(&adapter->napi)) { | 1323 | if (napi_schedule_prep(&adapter->napi)) { |
1324 | adapter->total_rx_bytes = 0; | 1324 | adapter->total_rx_bytes = 0; |
1325 | adapter->total_rx_packets = 0; | 1325 | adapter->total_rx_packets = 0; |
1326 | __netif_rx_schedule(&adapter->napi); | 1326 | __napi_schedule(&adapter->napi); |
1327 | } | 1327 | } |
1328 | return IRQ_HANDLED; | 1328 | return IRQ_HANDLED; |
1329 | } | 1329 | } |
@@ -2028,7 +2028,7 @@ clean_rx: | |||
2028 | if (work_done < budget) { | 2028 | if (work_done < budget) { |
2029 | if (adapter->itr_setting & 3) | 2029 | if (adapter->itr_setting & 3) |
2030 | e1000_set_itr(adapter); | 2030 | e1000_set_itr(adapter); |
2031 | netif_rx_complete(napi); | 2031 | napi_complete(napi); |
2032 | if (adapter->msix_entries) | 2032 | if (adapter->msix_entries) |
2033 | ew32(IMS, adapter->rx_ring->ims_val); | 2033 | ew32(IMS, adapter->rx_ring->ims_val); |
2034 | else | 2034 | else |