tg3: rename rx_[std|jmb]_ptr
Subsystems (2)
PATCH 14/20 tg3: rename rx_[std|jmb]_ptr
A later patch is going to add consumer indicies for the producer rings. To keep things readable, this patch renames rx_[std|jmb]_ptr to rx_[std|jmb]_prod_idx.
Signed-off-by Matt Carlson <[email protected]>
Reviewed-by Michael Chan <[email protected]>
--- drivers/net/tg3.c | 16 ++++++++-------- drivers/net/tg3.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-)
drivers/net/tg3.c +8 -8
@@ -4564,13 +4564,13 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget) ri = &tpr->rx_std_buffers[desc_idx]; dma_addr =pci_unmap_addr (ri, mapping); skb = ri->skb; - post_ptr = &tpr->rx_std_ptr; + post_ptr = &tpr->rx_std_prod_idx; rx_std_posted++; }else if (opaque_key ==RXD_OPAQUE_RING_JUMBO ) { ri = &tpr->rx_jmb_buffers[desc_idx]; dma_addr =pci_unmap_addr (ri, mapping); skb = ri->skb; - post_ptr = &tpr->rx_jmb_ptr; + post_ptr = &tpr->rx_jmb_prod_idx; }else goto next_pkt_nopost;
@@ -4687,12 +4687,12 @@ next_pkt_nopost:/* Refill RX ring(s). */ if (work_mask &RXD_OPAQUE_RING_STD ) { - sw_idx = tpr->rx_std_ptr %TG3_RX_RING_SIZE ; + sw_idx = tpr->rx_std_prod_idx %TG3_RX_RING_SIZE ;tw32_rx_mbox (MAILBOX_RCV_STD_PROD_IDX +TG3_64BIT_REG_LOW , sw_idx); }if (work_mask &RXD_OPAQUE_RING_JUMBO ) { - sw_idx = tpr->rx_jmb_ptr %TG3_RX_JUMBO_RING_SIZE ; + sw_idx = tpr->rx_jmb_prod_idx %TG3_RX_JUMBO_RING_SIZE ;tw32_rx_mbox (MAILBOX_RCV_JUMBO_PROD_IDX +TG3_64BIT_REG_LOW , sw_idx); }
@@ -7509,14 +7509,14 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)tw32 (RCVDBDI_STD_BD +TG3_BDINFO_MAXLEN_FLAGS , val); - tpr->rx_std_ptr = tp->rx_pending; + tpr->rx_std_prod_idx = tp->rx_pending;tw32_rx_mbox (MAILBOX_RCV_STD_PROD_IDX +TG3_64BIT_REG_LOW , - tpr->rx_std_ptr); + tpr->rx_std_prod_idx); - tpr->rx_jmb_ptr = (tp->tg3_flags &TG3_FLAG_JUMBO_RING_ENABLE ) ? + tpr->rx_jmb_prod_idx = (tp->tg3_flags &TG3_FLAG_JUMBO_RING_ENABLE ) ? tp->rx_jumbo_pending :0 ;tw32_rx_mbox (MAILBOX_RCV_JUMBO_PROD_IDX +TG3_64BIT_REG_LOW , - tpr->rx_jmb_ptr); + tpr->rx_jmb_prod_idx);if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 ) {tw32 (STD_REPLENISH_LWM ,32 );
drivers/net/tg3.h +2 -2
@@ -2570,8 +2570,8 @@ struct tg3_ethtool_stats { };struct tg3_rx_prodring_set { -u32 rx_std_ptr; -u32 rx_jmb_ptr; +u32 rx_std_prod_idx; +u32 rx_jmb_prod_idx;struct tg3_rx_buffer_desc *rx_std;struct tg3_ext_rx_buffer_desc *rx_jmb;struct ring_info *rx_std_buffers;
Signature · 1 line
1.6.4.4