diff options
Diffstat (limited to 'drivers/net/sfc/tx.c')
-rw-r--r-- | drivers/net/sfc/tx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c index c54fa30e6277..2531d0207b96 100644 --- a/drivers/net/sfc/tx.c +++ b/drivers/net/sfc/tx.c | |||
@@ -278,7 +278,7 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb) | |||
278 | buffer->continuation = false; | 278 | buffer->continuation = false; |
279 | 279 | ||
280 | /* Pass off to hardware */ | 280 | /* Pass off to hardware */ |
281 | falcon_push_buffers(tx_queue); | 281 | efx_nic_push_buffers(tx_queue); |
282 | 282 | ||
283 | return NETDEV_TX_OK; | 283 | return NETDEV_TX_OK; |
284 | 284 | ||
@@ -426,7 +426,7 @@ int efx_probe_tx_queue(struct efx_tx_queue *tx_queue) | |||
426 | tx_queue->buffer[i].continuation = true; | 426 | tx_queue->buffer[i].continuation = true; |
427 | 427 | ||
428 | /* Allocate hardware ring */ | 428 | /* Allocate hardware ring */ |
429 | rc = falcon_probe_tx(tx_queue); | 429 | rc = efx_nic_probe_tx(tx_queue); |
430 | if (rc) | 430 | if (rc) |
431 | goto fail; | 431 | goto fail; |
432 | 432 | ||
@@ -449,7 +449,7 @@ void efx_init_tx_queue(struct efx_tx_queue *tx_queue) | |||
449 | BUG_ON(tx_queue->stopped); | 449 | BUG_ON(tx_queue->stopped); |
450 | 450 | ||
451 | /* Set up TX descriptor ring */ | 451 | /* Set up TX descriptor ring */ |
452 | falcon_init_tx(tx_queue); | 452 | efx_nic_init_tx(tx_queue); |
453 | } | 453 | } |
454 | 454 | ||
455 | void efx_release_tx_buffers(struct efx_tx_queue *tx_queue) | 455 | void efx_release_tx_buffers(struct efx_tx_queue *tx_queue) |
@@ -475,7 +475,7 @@ void efx_fini_tx_queue(struct efx_tx_queue *tx_queue) | |||
475 | EFX_LOG(tx_queue->efx, "shutting down TX queue %d\n", tx_queue->queue); | 475 | EFX_LOG(tx_queue->efx, "shutting down TX queue %d\n", tx_queue->queue); |
476 | 476 | ||
477 | /* Flush TX queue, remove descriptor ring */ | 477 | /* Flush TX queue, remove descriptor ring */ |
478 | falcon_fini_tx(tx_queue); | 478 | efx_nic_fini_tx(tx_queue); |
479 | 479 | ||
480 | efx_release_tx_buffers(tx_queue); | 480 | efx_release_tx_buffers(tx_queue); |
481 | 481 | ||
@@ -492,7 +492,7 @@ void efx_fini_tx_queue(struct efx_tx_queue *tx_queue) | |||
492 | void efx_remove_tx_queue(struct efx_tx_queue *tx_queue) | 492 | void efx_remove_tx_queue(struct efx_tx_queue *tx_queue) |
493 | { | 493 | { |
494 | EFX_LOG(tx_queue->efx, "destroying TX queue %d\n", tx_queue->queue); | 494 | EFX_LOG(tx_queue->efx, "destroying TX queue %d\n", tx_queue->queue); |
495 | falcon_remove_tx(tx_queue); | 495 | efx_nic_remove_tx(tx_queue); |
496 | 496 | ||
497 | kfree(tx_queue->buffer); | 497 | kfree(tx_queue->buffer); |
498 | tx_queue->buffer = NULL; | 498 | tx_queue->buffer = NULL; |
@@ -1078,7 +1078,7 @@ static int efx_enqueue_skb_tso(struct efx_tx_queue *tx_queue, | |||
1078 | } | 1078 | } |
1079 | 1079 | ||
1080 | /* Pass off to hardware */ | 1080 | /* Pass off to hardware */ |
1081 | falcon_push_buffers(tx_queue); | 1081 | efx_nic_push_buffers(tx_queue); |
1082 | 1082 | ||
1083 | tx_queue->tso_bursts++; | 1083 | tx_queue->tso_bursts++; |
1084 | return NETDEV_TX_OK; | 1084 | return NETDEV_TX_OK; |