Commit 6d03b437 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman

staging: rtl8192e: Convert array rx_idx[] to variable rx_idx

Convert array rx_idx[] to variable rx_idx as index is always 0. Remove
unused rx_queue_idx as well. This increases readability.
Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/f9e3ee95cdc2de810687a9c71f1a9f8d8fdbeac1.1698295861.git.philipp.g.hortmann@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 33602365
...@@ -1142,7 +1142,6 @@ static void _rtl92e_free_rx_ring(struct net_device *dev) ...@@ -1142,7 +1142,6 @@ static void _rtl92e_free_rx_ring(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
int i; int i;
int rx_queue_idx = 0;
for (i = 0; i < priv->rxringcount; i++) { for (i = 0; i < priv->rxringcount; i++) {
struct sk_buff *skb = priv->rx_buf[i]; struct sk_buff *skb = priv->rx_buf[i];
...@@ -1352,7 +1351,6 @@ static short _rtl92e_alloc_rx_ring(struct net_device *dev) ...@@ -1352,7 +1351,6 @@ static short _rtl92e_alloc_rx_ring(struct net_device *dev)
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rx_desc *entry = NULL; struct rx_desc *entry = NULL;
int i; int i;
int rx_queue_idx = 0;
priv->rx_ring = dma_alloc_coherent(&priv->pdev->dev, priv->rx_ring = dma_alloc_coherent(&priv->pdev->dev,
sizeof(*priv->rx_ring) * priv->rxringcount, sizeof(*priv->rx_ring) * priv->rxringcount,
...@@ -1363,7 +1361,7 @@ static short _rtl92e_alloc_rx_ring(struct net_device *dev) ...@@ -1363,7 +1361,7 @@ static short _rtl92e_alloc_rx_ring(struct net_device *dev)
return -ENOMEM; return -ENOMEM;
} }
priv->rx_idx[rx_queue_idx] = 0; priv->rx_idx = 0;
for (i = 0; i < priv->rxringcount; i++) { for (i = 0; i < priv->rxringcount; i++) {
struct sk_buff *skb = dev_alloc_skb(priv->rxbuffersize); struct sk_buff *skb = dev_alloc_skb(priv->rxbuffersize);
...@@ -1452,7 +1450,6 @@ void rtl92e_reset_desc_ring(struct net_device *dev) ...@@ -1452,7 +1450,6 @@ void rtl92e_reset_desc_ring(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
int i; int i;
int rx_queue_idx = 0;
unsigned long flags = 0; unsigned long flags = 0;
if (priv->rx_ring) { if (priv->rx_ring) {
...@@ -1462,7 +1459,7 @@ void rtl92e_reset_desc_ring(struct net_device *dev) ...@@ -1462,7 +1459,7 @@ void rtl92e_reset_desc_ring(struct net_device *dev)
entry = &priv->rx_ring[i]; entry = &priv->rx_ring[i];
entry->OWN = 1; entry->OWN = 1;
} }
priv->rx_idx[rx_queue_idx] = 0; priv->rx_idx = 0;
} }
spin_lock_irqsave(&priv->irq_th_lock, flags); spin_lock_irqsave(&priv->irq_th_lock, flags);
...@@ -1561,7 +1558,6 @@ static void _rtl92e_rx_normal(struct net_device *dev) ...@@ -1561,7 +1558,6 @@ static void _rtl92e_rx_normal(struct net_device *dev)
struct ieee80211_hdr *rtllib_hdr = NULL; struct ieee80211_hdr *rtllib_hdr = NULL;
bool unicast_packet = false; bool unicast_packet = false;
u32 skb_len = 0; u32 skb_len = 0;
int rx_queue_idx = RX_MPDU_QUEUE;
struct rtllib_rx_stats stats = { struct rtllib_rx_stats stats = {
.signal = 0, .signal = 0,
...@@ -1574,9 +1570,9 @@ static void _rtl92e_rx_normal(struct net_device *dev) ...@@ -1574,9 +1570,9 @@ static void _rtl92e_rx_normal(struct net_device *dev)
while (count--) { while (count--) {
struct rx_desc *pdesc = &priv->rx_ring struct rx_desc *pdesc = &priv->rx_ring
[priv->rx_idx[rx_queue_idx]]; [priv->rx_idx];
struct sk_buff *skb = priv->rx_buf struct sk_buff *skb = priv->rx_buf
[priv->rx_idx[rx_queue_idx]]; [priv->rx_idx];
struct sk_buff *new_skb; struct sk_buff *new_skb;
if (pdesc->OWN) if (pdesc->OWN)
...@@ -1614,7 +1610,7 @@ static void _rtl92e_rx_normal(struct net_device *dev) ...@@ -1614,7 +1610,7 @@ static void _rtl92e_rx_normal(struct net_device *dev)
skb = new_skb; skb = new_skb;
skb->dev = dev; skb->dev = dev;
priv->rx_buf[priv->rx_idx[rx_queue_idx]] = priv->rx_buf[priv->rx_idx] =
skb; skb;
*((dma_addr_t *)skb->cb) = dma_map_single(&priv->pdev->dev, *((dma_addr_t *)skb->cb) = dma_map_single(&priv->pdev->dev,
skb_tail_pointer(skb), skb_tail_pointer(skb),
...@@ -1627,9 +1623,9 @@ static void _rtl92e_rx_normal(struct net_device *dev) ...@@ -1627,9 +1623,9 @@ static void _rtl92e_rx_normal(struct net_device *dev)
pdesc->BufferAddress = *((dma_addr_t *)skb->cb); pdesc->BufferAddress = *((dma_addr_t *)skb->cb);
pdesc->OWN = 1; pdesc->OWN = 1;
pdesc->Length = priv->rxbuffersize; pdesc->Length = priv->rxbuffersize;
if (priv->rx_idx[rx_queue_idx] == priv->rxringcount - 1) if (priv->rx_idx == priv->rxringcount - 1)
pdesc->EOR = 1; pdesc->EOR = 1;
priv->rx_idx[rx_queue_idx] = (priv->rx_idx[rx_queue_idx] + 1) % priv->rx_idx = (priv->rx_idx + 1) %
priv->rxringcount; priv->rxringcount;
} }
} }
......
...@@ -235,7 +235,7 @@ struct r8192_priv { ...@@ -235,7 +235,7 @@ struct r8192_priv {
struct rx_desc *rx_ring; struct rx_desc *rx_ring;
struct sk_buff *rx_buf[MAX_RX_COUNT]; struct sk_buff *rx_buf[MAX_RX_COUNT];
dma_addr_t rx_ring_dma; dma_addr_t rx_ring_dma;
unsigned int rx_idx[MAX_RX_QUEUE]; unsigned int rx_idx;
int rxringcount; int rxringcount;
u16 rxbuffersize; u16 rxbuffersize;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment