@@ -550,7 +550,7 @@ static bool device_init_rings(struct vnt_private *priv)
550550 priv -> opts .tx_descs [0 ] * sizeof (struct vnt_tx_desc );
551551
552552 /* vir_pool: pvoid type */
553- priv -> apTD0Rings = vir_pool
553+ priv -> ap_td0_rings = vir_pool
554554 + priv -> opts .rx_descs0 * sizeof (struct vnt_rx_desc )
555555 + priv -> opts .rx_descs1 * sizeof (struct vnt_rx_desc );
556556
@@ -720,7 +720,7 @@ static int device_init_td0_ring(struct vnt_private *priv)
720720 curr = priv -> td0_pool_dma ;
721721 for (i = 0 ; i < priv -> opts .tx_descs [0 ];
722722 i ++ , curr += sizeof (struct vnt_tx_desc )) {
723- desc = & priv -> apTD0Rings [i ];
723+ desc = & priv -> ap_td0_rings [i ];
724724 desc -> td_info = kzalloc (sizeof (* desc -> td_info ), GFP_KERNEL );
725725 if (!desc -> td_info ) {
726726 ret = - ENOMEM ;
@@ -730,20 +730,20 @@ static int device_init_td0_ring(struct vnt_private *priv)
730730 desc -> td_info -> buf = priv -> tx0_bufs + i * PKT_BUF_SZ ;
731731 desc -> td_info -> buf_dma = priv -> tx_bufs_dma0 + i * PKT_BUF_SZ ;
732732
733- desc -> next = & (priv -> apTD0Rings [(i + 1 ) % priv -> opts .tx_descs [0 ]]);
733+ desc -> next = & (priv -> ap_td0_rings [(i + 1 ) % priv -> opts .tx_descs [0 ]]);
734734 desc -> next_desc = cpu_to_le32 (curr +
735735 sizeof (struct vnt_tx_desc ));
736736 }
737737
738738 if (i > 0 )
739- priv -> apTD0Rings [i - 1 ].next_desc = cpu_to_le32 (priv -> td0_pool_dma );
740- priv -> tail_td [0 ] = priv -> apCurrTD [0 ] = & priv -> apTD0Rings [0 ];
739+ priv -> ap_td0_rings [i - 1 ].next_desc = cpu_to_le32 (priv -> td0_pool_dma );
740+ priv -> tail_td [0 ] = priv -> apCurrTD [0 ] = & priv -> ap_td0_rings [0 ];
741741
742742 return 0 ;
743743
744744err_free_desc :
745745 while (i -- ) {
746- desc = & priv -> apTD0Rings [i ];
746+ desc = & priv -> ap_td0_rings [i ];
747747 kfree (desc -> td_info );
748748 }
749749
@@ -795,7 +795,7 @@ static void device_free_td0_ring(struct vnt_private *priv)
795795 int i ;
796796
797797 for (i = 0 ; i < priv -> opts .tx_descs [0 ]; i ++ ) {
798- struct vnt_tx_desc * desc = & priv -> apTD0Rings [i ];
798+ struct vnt_tx_desc * desc = & priv -> ap_td0_rings [i ];
799799 struct vnt_td_info * td_info = desc -> td_info ;
800800
801801 dev_kfree_skb (td_info -> skb );
0 commit comments