@@ -554,7 +554,7 @@ static bool device_init_rings(struct vnt_private *priv)
554
554
+ priv -> opts .rx_descs0 * sizeof (struct vnt_rx_desc )
555
555
+ priv -> opts .rx_descs1 * sizeof (struct vnt_rx_desc );
556
556
557
- priv -> apTD1Rings = vir_pool
557
+ priv -> ap_td1_rings = vir_pool
558
558
+ priv -> opts .rx_descs0 * sizeof (struct vnt_rx_desc )
559
559
+ priv -> opts .rx_descs1 * sizeof (struct vnt_rx_desc )
560
560
+ priv -> opts .tx_descs [0 ] * sizeof (struct vnt_tx_desc );
@@ -761,7 +761,7 @@ static int device_init_td1_ring(struct vnt_private *priv)
761
761
curr = priv -> td1_pool_dma ;
762
762
for (i = 0 ; i < priv -> opts .tx_descs [1 ];
763
763
i ++ , curr += sizeof (struct vnt_tx_desc )) {
764
- desc = & priv -> apTD1Rings [i ];
764
+ desc = & priv -> ap_td1_rings [i ];
765
765
desc -> td_info = kzalloc (sizeof (* desc -> td_info ), GFP_KERNEL );
766
766
if (!desc -> td_info ) {
767
767
ret = - ENOMEM ;
@@ -771,19 +771,19 @@ static int device_init_td1_ring(struct vnt_private *priv)
771
771
desc -> td_info -> buf = priv -> tx1_bufs + i * PKT_BUF_SZ ;
772
772
desc -> td_info -> buf_dma = priv -> tx_bufs_dma1 + i * PKT_BUF_SZ ;
773
773
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 ]]);
775
775
desc -> next_desc = cpu_to_le32 (curr + sizeof (struct vnt_tx_desc ));
776
776
}
777
777
778
778
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 ];
781
781
782
782
return 0 ;
783
783
784
784
err_free_desc :
785
785
while (i -- ) {
786
- desc = & priv -> apTD1Rings [i ];
786
+ desc = & priv -> ap_td1_rings [i ];
787
787
kfree (desc -> td_info );
788
788
}
789
789
@@ -808,7 +808,7 @@ static void device_free_td1_ring(struct vnt_private *priv)
808
808
int i ;
809
809
810
810
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 ];
812
812
struct vnt_td_info * td_info = desc -> td_info ;
813
813
814
814
dev_kfree_skb (td_info -> skb );
0 commit comments