diff options
| author |   Martin Habets <habetsm.xilinx@gmail.com> | 2022-05-09 16:32:33 +0100 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2022-05-10 15:38:15 -0700 |
| commit | 95e96f7788d0ccea7e70322ce75b873d43124dc9 (patch) | |
| tree | 081297bde38bf64c8922ba14f70f074d167697bc /drivers/net/ethernet/sfc/siena/tx.c | |
| parent | sfc/siena: Rename RX/TX functions to avoid conflicts with sfc (diff) | |
| download | linux-dev-95e96f7788d0ccea7e70322ce75b873d43124dc9.tar.xz linux-dev-95e96f7788d0ccea7e70322ce75b873d43124dc9.zip | |
sfc/siena: Rename peripheral functions to avoid conflicts with sfc
For siena use efx_siena_ as the function prefix.
This patch covers selftest.h, ptp.h, net_driver.h and ethtool_common.h.
efx_ethtool_fill_self_tests() can become static.
Some functions in ptp.c can also become static.
Rename loopback_mode in net_driver.h.
Signed-off-by: Martin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/sfc/siena/tx.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/siena/tx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/sfc/siena/tx.c b/drivers/net/ethernet/sfc/siena/tx.c index 0677a0254d85..ef238e9efa94 100644 --- a/drivers/net/ethernet/sfc/siena/tx.c +++ b/drivers/net/ethernet/sfc/siena/tx.c @@ -321,14 +321,14 @@ netdev_tx_t efx_siena_hard_start_xmit(struct sk_buff *skb, /* PTP "event" packet */ if (unlikely(efx_xmit_with_hwtstamp(skb)) && - ((efx_ptp_use_mac_tx_timestamps(efx) && efx->ptp_data) || - unlikely(efx_ptp_is_ptp_tx(efx, skb)))) { + ((efx_siena_ptp_use_mac_tx_timestamps(efx) && efx->ptp_data) || + unlikely(efx_siena_ptp_is_ptp_tx(efx, skb)))) { /* There may be existing transmits on the channel that are * waiting for this packet to trigger the doorbell write. * We need to send the packets at this point. */ efx_tx_send_pending(efx_get_tx_channel(efx, index)); - return efx_ptp_tx(efx, skb); + return efx_siena_ptp_tx(efx, skb); } tx_queue = efx_get_tx_queue(efx, index, type); |