@@ -554,7 +554,7 @@ static bool device_init_rings(struct vnt_private *priv)
554554 + priv -> opts .rx_descs0 * sizeof (struct vnt_rx_desc )
555555 + priv -> opts .rx_descs1 * sizeof (struct vnt_rx_desc );
556556
557- priv -> apTD1Rings = vir_pool
557+ priv -> ap_td1_rings = vir_pool
558558 + priv -> opts .rx_descs0 * sizeof (struct vnt_rx_desc )
559559 + priv -> opts .rx_descs1 * sizeof (struct vnt_rx_desc )
560560 + priv -> opts .tx_descs [0 ] * sizeof (struct vnt_tx_desc );
@@ -761,7 +761,7 @@ static int device_init_td1_ring(struct vnt_private *priv)
761761 curr = priv -> td1_pool_dma ;
762762 for (i = 0 ; i < priv -> opts .tx_descs [1 ];
763763 i ++ , curr += sizeof (struct vnt_tx_desc )) {
764- desc = & priv -> apTD1Rings [i ];
764+ desc = & priv -> ap_td1_rings [i ];
765765 desc -> td_info = kzalloc (sizeof (* desc -> td_info ), GFP_KERNEL );
766766 if (!desc -> td_info ) {
767767 ret = - ENOMEM ;
@@ -771,19 +771,19 @@ static int device_init_td1_ring(struct vnt_private *priv)
771771 desc -> td_info -> buf = priv -> tx1_bufs + i * PKT_BUF_SZ ;
772772 desc -> td_info -> buf_dma = priv -> tx_bufs_dma1 + i * PKT_BUF_SZ ;
773773
774- desc -> next = & (priv -> apTD1Rings [(i + 1 ) % priv -> opts .tx_descs [1 ]]);
774+ desc -> next = & (priv -> ap_td1_rings [(i + 1 ) % priv -> opts .tx_descs [1 ]]);
775775 desc -> next_desc = cpu_to_le32 (curr + sizeof (struct vnt_tx_desc ));
776776 }
777777
778778 if (i > 0 )
779- priv -> apTD1Rings [i - 1 ].next_desc = cpu_to_le32 (priv -> td1_pool_dma );
780- priv -> tail_td [1 ] = priv -> apCurrTD [1 ] = & priv -> apTD1Rings [0 ];
779+ priv -> ap_td1_rings [i - 1 ].next_desc = cpu_to_le32 (priv -> td1_pool_dma );
780+ priv -> tail_td [1 ] = priv -> apCurrTD [1 ] = & priv -> ap_td1_rings [0 ];
781781
782782 return 0 ;
783783
784784err_free_desc :
785785 while (i -- ) {
786- desc = & priv -> apTD1Rings [i ];
786+ desc = & priv -> ap_td1_rings [i ];
787787 kfree (desc -> td_info );
788788 }
789789
@@ -808,7 +808,7 @@ static void device_free_td1_ring(struct vnt_private *priv)
808808 int i ;
809809
810810 for (i = 0 ; i < priv -> opts .tx_descs [1 ]; i ++ ) {
811- struct vnt_tx_desc * desc = & priv -> apTD1Rings [i ];
811+ struct vnt_tx_desc * desc = & priv -> ap_td1_rings [i ];
812812 struct vnt_td_info * td_info = desc -> td_info ;
813813
814814 dev_kfree_skb (td_info -> skb );
0 commit comments