2011-05-23 13:54:24

by Mike McCormack

Subject: [PATCH 3/8] rtlwifi: Store loop index in local variable

_rtl_pci_rx_interrupt uses rtlpci->rx_ring[rx_queue_idx].idx a
few times, so store it in a separate variable.

Signed-off-by: Mike McCormack <[email protected]>
---
drivers/net/wireless/rtlwifi/pci.c | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index a409528..5eedb91 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -644,22 +644,23 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
.noise = -98,
.rate = 0,
};
+ int index = rtlpci->rx_ring[rx_queue_idx].idx;

/*RX NORMAL PKT */
while (count--) {
/*rx descriptor */
struct rtl_rx_desc *pdesc = &rtlpci->rx_ring[rx_queue_idx].desc[
- rtlpci->rx_ring[rx_queue_idx].idx];
+ index];
/*rx pkt */
struct sk_buff *skb = rtlpci->rx_ring[rx_queue_idx].rx_buf[
- rtlpci->rx_ring[rx_queue_idx].idx];
+ index];

own = (u8) rtlpriv->cfg->ops->get_desc((u8 *) pdesc,
false, HW_DESC_OWN);

if (own) {
/*wait data to be filled by hardware */
- return;
+ break;
} else {
struct ieee80211_hdr *hdr;
__le16 fc;
@@ -768,10 +769,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
skb = new_skb;
/*skb->dev = dev; */

- rtlpci->rx_ring[rx_queue_idx].rx_buf[rtlpci->
- rx_ring
- [rx_queue_idx].
- idx] = skb;
+ rtlpci->rx_ring[rx_queue_idx].rx_buf[index] = skb;
*((dma_addr_t *) skb->cb) =
pci_map_single(rtlpci->pdev, skb_tail_pointer(skb),
rtlpci->rxbuffersize,
@@ -790,17 +788,15 @@ done:
HW_DESC_RXPKT_LEN,
(u8 *)&rtlpci->rxbuffersize);

- if (rtlpci->rx_ring[rx_queue_idx].idx ==
- rtlpci->rxringcount - 1)
+ if (index == rtlpci->rxringcount - 1)
rtlpriv->cfg->ops->set_desc((u8 *)pdesc, false,
HW_DESC_RXERO,
(u8 *)&tmp_one);

- rtlpci->rx_ring[rx_queue_idx].idx =
- (rtlpci->rx_ring[rx_queue_idx].idx + 1) %
- rtlpci->rxringcount;
+ index = (index + 1) % rtlpci->rxringcount;
}

+ rtlpci->rx_ring[rx_queue_idx].idx = index;
}

static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
--
1.7.4.1

2011-05-23 19:47:25

by Larry Finger

Subject: Re: [PATCH 3/8] rtlwifi: Store loop index in local variable

On 05/23/2011 08:54 AM, Mike McCormack wrote:
> _rtl_pci_rx_interrupt uses rtlpci->rx_ring[rx_queue_idx].idx a
> few times, so store it in a separate variable.
>
> Signed-off-by: Mike McCormack<[email protected]>
> ---
> drivers/net/wireless/rtlwifi/pci.c | 20 ++++++++------------
> 1 files changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
> index a409528..5eedb91 100644
> --- a/drivers/net/wireless/rtlwifi/pci.c
> +++ b/drivers/net/wireless/rtlwifi/pci.c
> @@ -644,22 +644,23 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
> .noise = -98,
> .rate = 0,
> };
> + int index = rtlpci->rx_ring[rx_queue_idx].idx;
>
> /*RX NORMAL PKT */
> while (count--) {
> /*rx descriptor */
> struct rtl_rx_desc *pdesc =&rtlpci->rx_ring[rx_queue_idx].desc[
> - rtlpci->rx_ring[rx_queue_idx].idx];
> + index];
> /*rx pkt */
> struct sk_buff *skb = rtlpci->rx_ring[rx_queue_idx].rx_buf[
> - rtlpci->rx_ring[rx_queue_idx].idx];
> + index];
>
> own = (u8) rtlpriv->cfg->ops->get_desc((u8 *) pdesc,
> false, HW_DESC_OWN);
>
> if (own) {
> /*wait data to be filled by hardware */
> - return;
> + break;
> } else {
> struct ieee80211_hdr *hdr;
> __le16 fc;
> @@ -768,10 +769,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
> skb = new_skb;
> /*skb->dev = dev; */
>
> - rtlpci->rx_ring[rx_queue_idx].rx_buf[rtlpci->
> - rx_ring
> - [rx_queue_idx].
> - idx] = skb;
> + rtlpci->rx_ring[rx_queue_idx].rx_buf[index] = skb;
> *((dma_addr_t *) skb->cb) =
> pci_map_single(rtlpci->pdev, skb_tail_pointer(skb),
> rtlpci->rxbuffersize,
> @@ -790,17 +788,15 @@ done:
> HW_DESC_RXPKT_LEN,
> (u8 *)&rtlpci->rxbuffersize);
>
> - if (rtlpci->rx_ring[rx_queue_idx].idx ==
> - rtlpci->rxringcount - 1)
> + if (index == rtlpci->rxringcount - 1)
> rtlpriv->cfg->ops->set_desc((u8 *)pdesc, false,
> HW_DESC_RXERO,
> (u8 *)&tmp_one);
>
> - rtlpci->rx_ring[rx_queue_idx].idx =
> - (rtlpci->rx_ring[rx_queue_idx].idx + 1) %
> - rtlpci->rxringcount;
> + index = (index + 1) % rtlpci->rxringcount;
> }
>
> + rtlpci->rx_ring[rx_queue_idx].idx = index;
> }
>
> static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)

Signed-off-by: Larry Finger <[email protected]>
---