@@ -550,7 +550,7 @@ static bool device_init_rings(struct vnt_private *priv)
550
550
priv -> opts .tx_descs [0 ] * sizeof (struct vnt_tx_desc );
551
551
552
552
/* vir_pool: pvoid type */
553
- priv -> apTD0Rings = vir_pool
553
+ priv -> ap_td0_rings = vir_pool
554
554
+ priv -> opts .rx_descs0 * sizeof (struct vnt_rx_desc )
555
555
+ priv -> opts .rx_descs1 * sizeof (struct vnt_rx_desc );
556
556
@@ -720,7 +720,7 @@ static int device_init_td0_ring(struct vnt_private *priv)
720
720
curr = priv -> td0_pool_dma ;
721
721
for (i = 0 ; i < priv -> opts .tx_descs [0 ];
722
722
i ++ , curr += sizeof (struct vnt_tx_desc )) {
723
- desc = & priv -> apTD0Rings [i ];
723
+ desc = & priv -> ap_td0_rings [i ];
724
724
desc -> td_info = kzalloc (sizeof (* desc -> td_info ), GFP_KERNEL );
725
725
if (!desc -> td_info ) {
726
726
ret = - ENOMEM ;
@@ -730,20 +730,20 @@ static int device_init_td0_ring(struct vnt_private *priv)
730
730
desc -> td_info -> buf = priv -> tx0_bufs + i * PKT_BUF_SZ ;
731
731
desc -> td_info -> buf_dma = priv -> tx_bufs_dma0 + i * PKT_BUF_SZ ;
732
732
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 ]]);
734
734
desc -> next_desc = cpu_to_le32 (curr +
735
735
sizeof (struct vnt_tx_desc ));
736
736
}
737
737
738
738
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 ];
741
741
742
742
return 0 ;
743
743
744
744
err_free_desc :
745
745
while (i -- ) {
746
- desc = & priv -> apTD0Rings [i ];
746
+ desc = & priv -> ap_td0_rings [i ];
747
747
kfree (desc -> td_info );
748
748
}
749
749
@@ -795,7 +795,7 @@ static void device_free_td0_ring(struct vnt_private *priv)
795
795
int i ;
796
796
797
797
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 ];
799
799
struct vnt_td_info * td_info = desc -> td_info ;
800
800
801
801
dev_kfree_skb (td_info -> skb );
0 commit comments