3 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
index 9da3a03e8c07..7b97d3852091 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
@@ -1198,7 +1198,7 @@ static void xgbe_config_dcb_pfc(struct xgbe_prv_data *pdata)
         xgbe_config_flow_control(pdata);
 }
 
-static void xgbe_pre_xmit(struct xgbe_channel *channel)
+static void xgbe_dev_xmit(struct xgbe_channel *channel)
 {
         struct xgbe_prv_data *pdata = channel->pdata;
         struct xgbe_ring *ring = channel->tx_ring;
@@ -1211,7 +1211,7 @@ static void xgbe_pre_xmit(struct xgbe_channel *channel)
         int start_index = ring->cur;
         int i;
 
-        DBGPR("-->xgbe_pre_xmit\n");
+        DBGPR("-->xgbe_dev_xmit\n");
 
         csum = XGMAC_GET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES,
                               CSUM_ENABLE);
@@ -1410,7 +1410,7 @@ static void xgbe_pre_xmit(struct xgbe_channel *channel)
               channel->name, start_index & (ring->rdesc_count - 1),
               (ring->cur - 1) & (ring->rdesc_count - 1));
 
-        DBGPR("<--xgbe_pre_xmit\n");
+        DBGPR("<--xgbe_dev_xmit\n");
 }
 
 static int xgbe_dev_read(struct xgbe_channel *channel)
@@ -2561,7 +2561,7 @@ void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
         hw_if->powerup_rx = xgbe_powerup_rx;
         hw_if->powerdown_rx = xgbe_powerdown_rx;
 
-        hw_if->pre_xmit = xgbe_pre_xmit;
+        hw_if->dev_xmit = xgbe_dev_xmit;
         hw_if->dev_read = xgbe_dev_read;
         hw_if->enable_int = xgbe_enable_int;
         hw_if->disable_int = xgbe_disable_int;
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index 07b00bdcd9f9..8cb2372f8fa9 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -1343,7 +1343,7 @@ static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
         xgbe_prep_tx_tstamp(pdata, skb, packet);
 
         /* Configure required descriptor fields for transmission */
-        hw_if->pre_xmit(channel);
+        hw_if->dev_xmit(channel);
 
 #ifdef XGMAC_ENABLE_TX_PKT_DUMP
         xgbe_print_pkt(netdev, skb, true);
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
index 789957d43a13..0dc15d7c6ae1 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
@@ -456,7 +456,7 @@ struct xgbe_hw_if {
 
         int (*enable_int)(struct xgbe_channel *, enum xgbe_int);
         int (*disable_int)(struct xgbe_channel *, enum xgbe_int);
-        void (*pre_xmit)(struct xgbe_channel *);
+        void (*dev_xmit)(struct xgbe_channel *);
         int (*dev_read)(struct xgbe_channel *);
         void (*tx_desc_init)(struct xgbe_channel *);
         void (*rx_desc_init)(struct xgbe_channel *);