@@ -1142,7 +1142,6 @@ static void _rtl92e_free_rx_ring(struct net_device *dev)
11421142{
11431143 struct r8192_priv * priv = rtllib_priv (dev );
11441144 int i ;
1145- int rx_queue_idx = 0 ;
11461145
11471146 for (i = 0 ; i < priv -> rxringcount ; i ++ ) {
11481147 struct sk_buff * skb = priv -> rx_buf [i ];
@@ -1352,7 +1351,6 @@ static short _rtl92e_alloc_rx_ring(struct net_device *dev)
13521351 struct r8192_priv * priv = rtllib_priv (dev );
13531352 struct rx_desc * entry = NULL ;
13541353 int i ;
1355- int rx_queue_idx = 0 ;
13561354
13571355 priv -> rx_ring = dma_alloc_coherent (& priv -> pdev -> dev ,
13581356 sizeof (* priv -> rx_ring ) * priv -> rxringcount ,
@@ -1363,7 +1361,7 @@ static short _rtl92e_alloc_rx_ring(struct net_device *dev)
13631361 return - ENOMEM ;
13641362 }
13651363
1366- priv -> rx_idx [ rx_queue_idx ] = 0 ;
1364+ priv -> rx_idx = 0 ;
13671365
13681366 for (i = 0 ; i < priv -> rxringcount ; i ++ ) {
13691367 struct sk_buff * skb = dev_alloc_skb (priv -> rxbuffersize );
@@ -1452,7 +1450,6 @@ void rtl92e_reset_desc_ring(struct net_device *dev)
14521450{
14531451 struct r8192_priv * priv = rtllib_priv (dev );
14541452 int i ;
1455- int rx_queue_idx = 0 ;
14561453 unsigned long flags = 0 ;
14571454
14581455 if (priv -> rx_ring ) {
@@ -1462,7 +1459,7 @@ void rtl92e_reset_desc_ring(struct net_device *dev)
14621459 entry = & priv -> rx_ring [i ];
14631460 entry -> OWN = 1 ;
14641461 }
1465- priv -> rx_idx [ rx_queue_idx ] = 0 ;
1462+ priv -> rx_idx = 0 ;
14661463 }
14671464
14681465 spin_lock_irqsave (& priv -> irq_th_lock , flags );
@@ -1561,7 +1558,6 @@ static void _rtl92e_rx_normal(struct net_device *dev)
15611558 struct ieee80211_hdr * rtllib_hdr = NULL ;
15621559 bool unicast_packet = false;
15631560 u32 skb_len = 0 ;
1564- int rx_queue_idx = RX_MPDU_QUEUE ;
15651561
15661562 struct rtllib_rx_stats stats = {
15671563 .signal = 0 ,
@@ -1574,9 +1570,9 @@ static void _rtl92e_rx_normal(struct net_device *dev)
15741570
15751571 while (count -- ) {
15761572 struct rx_desc * pdesc = & priv -> rx_ring
1577- [priv -> rx_idx [ rx_queue_idx ] ];
1573+ [priv -> rx_idx ];
15781574 struct sk_buff * skb = priv -> rx_buf
1579- [priv -> rx_idx [ rx_queue_idx ] ];
1575+ [priv -> rx_idx ];
15801576 struct sk_buff * new_skb ;
15811577
15821578 if (pdesc -> OWN )
@@ -1614,7 +1610,7 @@ static void _rtl92e_rx_normal(struct net_device *dev)
16141610 skb = new_skb ;
16151611 skb -> dev = dev ;
16161612
1617- priv -> rx_buf [priv -> rx_idx [ rx_queue_idx ] ] =
1613+ priv -> rx_buf [priv -> rx_idx ] =
16181614 skb ;
16191615 * ((dma_addr_t * )skb -> cb ) = dma_map_single (& priv -> pdev -> dev ,
16201616 skb_tail_pointer (skb ),
@@ -1627,9 +1623,9 @@ static void _rtl92e_rx_normal(struct net_device *dev)
16271623 pdesc -> BufferAddress = * ((dma_addr_t * )skb -> cb );
16281624 pdesc -> OWN = 1 ;
16291625 pdesc -> Length = priv -> rxbuffersize ;
1630- if (priv -> rx_idx [ rx_queue_idx ] == priv -> rxringcount - 1 )
1626+ if (priv -> rx_idx == priv -> rxringcount - 1 )
16311627 pdesc -> EOR = 1 ;
1632- priv -> rx_idx [ rx_queue_idx ] = (priv -> rx_idx [ rx_queue_idx ] + 1 ) %
1628+ priv -> rx_idx = (priv -> rx_idx + 1 ) %
16331629 priv -> rxringcount ;
16341630 }
16351631}
0 commit comments