Commit a9d41981 authored by Lendacky, Thomas's avatar Lendacky, Thomas Committed by David S. Miller

amd-xgbe: Rename pre_xmit function to dev_xmit

The pre_xmit function name implies that it performs operations prior
to transmitting the packet when in fact it is responsible for setting
up the descriptors and initiating the transmit.  Rename this to
function from pre_xmit to dev_xmit, which is consistent with the name
used during receive processing - dev_read.
Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4780b7ca
...@@ -1198,7 +1198,7 @@ static void xgbe_config_dcb_pfc(struct xgbe_prv_data *pdata) ...@@ -1198,7 +1198,7 @@ static void xgbe_config_dcb_pfc(struct xgbe_prv_data *pdata)
xgbe_config_flow_control(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_prv_data *pdata = channel->pdata;
struct xgbe_ring *ring = channel->tx_ring; struct xgbe_ring *ring = channel->tx_ring;
...@@ -1211,7 +1211,7 @@ static void xgbe_pre_xmit(struct xgbe_channel *channel) ...@@ -1211,7 +1211,7 @@ static void xgbe_pre_xmit(struct xgbe_channel *channel)
int start_index = ring->cur; int start_index = ring->cur;
int i; int i;
DBGPR("-->xgbe_pre_xmit\n"); DBGPR("-->xgbe_dev_xmit\n");
csum = XGMAC_GET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES, csum = XGMAC_GET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES,
CSUM_ENABLE); CSUM_ENABLE);
...@@ -1410,7 +1410,7 @@ static void xgbe_pre_xmit(struct xgbe_channel *channel) ...@@ -1410,7 +1410,7 @@ static void xgbe_pre_xmit(struct xgbe_channel *channel)
channel->name, start_index & (ring->rdesc_count - 1), channel->name, start_index & (ring->rdesc_count - 1),
(ring->cur - 1) & (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) 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) ...@@ -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->powerup_rx = xgbe_powerup_rx;
hw_if->powerdown_rx = xgbe_powerdown_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->dev_read = xgbe_dev_read;
hw_if->enable_int = xgbe_enable_int; hw_if->enable_int = xgbe_enable_int;
hw_if->disable_int = xgbe_disable_int; hw_if->disable_int = xgbe_disable_int;
......
...@@ -1343,7 +1343,7 @@ static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev) ...@@ -1343,7 +1343,7 @@ static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
xgbe_prep_tx_tstamp(pdata, skb, packet); xgbe_prep_tx_tstamp(pdata, skb, packet);
/* Configure required descriptor fields for transmission */ /* Configure required descriptor fields for transmission */
hw_if->pre_xmit(channel); hw_if->dev_xmit(channel);
#ifdef XGMAC_ENABLE_TX_PKT_DUMP #ifdef XGMAC_ENABLE_TX_PKT_DUMP
xgbe_print_pkt(netdev, skb, true); xgbe_print_pkt(netdev, skb, true);
......
...@@ -456,7 +456,7 @@ struct xgbe_hw_if { ...@@ -456,7 +456,7 @@ struct xgbe_hw_if {
int (*enable_int)(struct xgbe_channel *, enum xgbe_int); int (*enable_int)(struct xgbe_channel *, enum xgbe_int);
int (*disable_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 *); int (*dev_read)(struct xgbe_channel *);
void (*tx_desc_init)(struct xgbe_channel *); void (*tx_desc_init)(struct xgbe_channel *);
void (*rx_desc_init)(struct xgbe_channel *); void (*rx_desc_init)(struct xgbe_channel *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment