aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ice/ice_txrx.c
diff options
context:
space:
mode:
authorAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>2018-10-26 14:44:47 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2018-11-20 14:39:04 -0500
commitd337f2afb7aceb16840a2621c5e2f9e868630653 (patch)
tree251f3056c87c47a1045c04e435d0029ebce1c1ff /drivers/net/ethernet/intel/ice/ice_txrx.c
parentdf17b7e02f0fa3a13c5aac26c317447d72612e1c (diff)
ice: Use Tx|Rx in comments
In code comments, use Tx|Rx instead of tx|rx Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_txrx.c')
-rw-r--r--drivers/net/ethernet/intel/ice/ice_txrx.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c
index 939510b7e8f3..4b92863b3500 100644
--- a/drivers/net/ethernet/intel/ice/ice_txrx.c
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c
@@ -219,7 +219,7 @@ static bool ice_clean_tx_irq(struct ice_vsi *vsi, struct ice_ring *tx_ring,
219 219
220/** 220/**
221 * ice_setup_tx_ring - Allocate the Tx descriptors 221 * ice_setup_tx_ring - Allocate the Tx descriptors
222 * @tx_ring: the tx ring to set up 222 * @tx_ring: the Tx ring to set up
223 * 223 *
224 * Return 0 on success, negative on error 224 * Return 0 on success, negative on error
225 */ 225 */
@@ -324,7 +324,7 @@ void ice_free_rx_ring(struct ice_ring *rx_ring)
324 324
325/** 325/**
326 * ice_setup_rx_ring - Allocate the Rx descriptors 326 * ice_setup_rx_ring - Allocate the Rx descriptors
327 * @rx_ring: the rx ring to set up 327 * @rx_ring: the Rx ring to set up
328 * 328 *
329 * Return 0 on success, negative on error 329 * Return 0 on success, negative on error
330 */ 330 */
@@ -586,7 +586,7 @@ static bool ice_add_rx_frag(struct ice_rx_buf *rx_buf,
586 586
587/** 587/**
588 * ice_reuse_rx_page - page flip buffer and store it back on the ring 588 * ice_reuse_rx_page - page flip buffer and store it back on the ring
589 * @rx_ring: rx descriptor ring to store buffers on 589 * @rx_ring: Rx descriptor ring to store buffers on
590 * @old_buf: donor buffer to have page reused 590 * @old_buf: donor buffer to have page reused
591 * 591 *
592 * Synchronizes page for reuse by the adapter 592 * Synchronizes page for reuse by the adapter
@@ -609,7 +609,7 @@ static void ice_reuse_rx_page(struct ice_ring *rx_ring,
609 609
610/** 610/**
611 * ice_fetch_rx_buf - Allocate skb and populate it 611 * ice_fetch_rx_buf - Allocate skb and populate it
612 * @rx_ring: rx descriptor ring to transact packets on 612 * @rx_ring: Rx descriptor ring to transact packets on
613 * @rx_desc: descriptor containing info written by hardware 613 * @rx_desc: descriptor containing info written by hardware
614 * 614 *
615 * This function allocates an skb on the fly, and populates it with the page 615 * This function allocates an skb on the fly, and populates it with the page
@@ -904,7 +904,7 @@ checksum_fail:
904 904
905/** 905/**
906 * ice_process_skb_fields - Populate skb header fields from Rx descriptor 906 * ice_process_skb_fields - Populate skb header fields from Rx descriptor
907 * @rx_ring: rx descriptor ring packet is being transacted on 907 * @rx_ring: Rx descriptor ring packet is being transacted on
908 * @rx_desc: pointer to the EOP Rx descriptor 908 * @rx_desc: pointer to the EOP Rx descriptor
909 * @skb: pointer to current skb being populated 909 * @skb: pointer to current skb being populated
910 * @ptype: the packet type decoded by hardware 910 * @ptype: the packet type decoded by hardware
@@ -927,7 +927,7 @@ static void ice_process_skb_fields(struct ice_ring *rx_ring,
927 927
928/** 928/**
929 * ice_receive_skb - Send a completed packet up the stack 929 * ice_receive_skb - Send a completed packet up the stack
930 * @rx_ring: rx ring in play 930 * @rx_ring: Rx ring in play
931 * @skb: packet to send up 931 * @skb: packet to send up
932 * @vlan_tag: vlan tag for packet 932 * @vlan_tag: vlan tag for packet
933 * 933 *
@@ -946,7 +946,7 @@ static void ice_receive_skb(struct ice_ring *rx_ring, struct sk_buff *skb,
946 946
947/** 947/**
948 * ice_clean_rx_irq - Clean completed descriptors from Rx ring - bounce buf 948 * ice_clean_rx_irq - Clean completed descriptors from Rx ring - bounce buf
949 * @rx_ring: rx descriptor ring to transact packets on 949 * @rx_ring: Rx descriptor ring to transact packets on
950 * @budget: Total limit on number of packets to process 950 * @budget: Total limit on number of packets to process
951 * 951 *
952 * This function provides a "bounce buffer" approach to Rx interrupt 952 * This function provides a "bounce buffer" approach to Rx interrupt
@@ -1123,7 +1123,7 @@ build_ctob(u64 td_cmd, u64 td_offset, unsigned int size, u64 td_tag)
1123} 1123}
1124 1124
1125/** 1125/**
1126 * __ice_maybe_stop_tx - 2nd level check for tx stop conditions 1126 * __ice_maybe_stop_tx - 2nd level check for Tx stop conditions
1127 * @tx_ring: the ring to be checked 1127 * @tx_ring: the ring to be checked
1128 * @size: the size buffer we want to assure is available 1128 * @size: the size buffer we want to assure is available
1129 * 1129 *
@@ -1146,7 +1146,7 @@ static int __ice_maybe_stop_tx(struct ice_ring *tx_ring, unsigned int size)
1146} 1146}
1147 1147
1148/** 1148/**
1149 * ice_maybe_stop_tx - 1st level check for tx stop conditions 1149 * ice_maybe_stop_tx - 1st level check for Tx stop conditions
1150 * @tx_ring: the ring to be checked 1150 * @tx_ring: the ring to be checked
1151 * @size: the size buffer we want to assure is available 1151 * @size: the size buffer we want to assure is available
1152 * 1152 *
@@ -1156,6 +1156,7 @@ static int ice_maybe_stop_tx(struct ice_ring *tx_ring, unsigned int size)
1156{ 1156{
1157 if (likely(ICE_DESC_UNUSED(tx_ring) >= size)) 1157 if (likely(ICE_DESC_UNUSED(tx_ring) >= size))
1158 return 0; 1158 return 0;
1159
1159 return __ice_maybe_stop_tx(tx_ring, size); 1160 return __ice_maybe_stop_tx(tx_ring, size);
1160} 1161}
1161 1162
@@ -1569,7 +1570,7 @@ static unsigned int ice_txd_use_count(unsigned int size)
1569} 1570}
1570 1571
1571/** 1572/**
1572 * ice_xmit_desc_count - calculate number of tx descriptors needed 1573 * ice_xmit_desc_count - calculate number of Tx descriptors needed
1573 * @skb: send buffer 1574 * @skb: send buffer
1574 * 1575 *
1575 * Returns number of data descriptors needed for this skb. 1576 * Returns number of data descriptors needed for this skb.