rtlwifi: Remove unnecessary indent

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index e502db0532e553df0bbc5e5d98c74e685df326fd..fbb4c1309568c62c3c1e9d2257b676e6901a265d 100644 (file)
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -654,128 +654,114 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
                /*rx pkt */
                struct sk_buff *skb = rtlpci->rx_ring[rx_queue_idx].rx_buf[
                                index];
+               struct ieee80211_hdr *hdr;
+               __le16 fc;
+               struct sk_buff *new_skb = NULL;
 
                own = (u8) rtlpriv->cfg->ops->get_desc((u8 *) pdesc,
                                                       false, HW_DESC_OWN);
 
-               if (own) {
-                       /*wait data to be filled by hardware */
+               /*wait data to be filled by hardware */
+               if (own)
                        break;
-               } else {
-                       struct ieee80211_hdr *hdr;
-                       __le16 fc;
-                       struct sk_buff *new_skb = NULL;
-
-                       rtlpriv->cfg->ops->query_rx_desc(hw, &stats,
-                                                        &rx_status,
-                                                        (u8 *) pdesc, skb);
-
-                       new_skb = dev_alloc_skb(rtlpci->rxbuffersize);
-                       if (unlikely(!new_skb)) {
-                               RT_TRACE(rtlpriv, (COMP_INTR | COMP_RECV),
-                                        DBG_DMESG,
-                                        ("can't alloc skb for rx\n"));
-                               goto done;
-                       }
 
-                       pci_unmap_single(rtlpci->pdev,
-                                        *((dma_addr_t *) skb->cb),
-                                        rtlpci->rxbuffersize,
-                                        PCI_DMA_FROMDEVICE);
+               rtlpriv->cfg->ops->query_rx_desc(hw, &stats,
+                                                &rx_status,
+                                                (u8 *) pdesc, skb);
+
+               new_skb = dev_alloc_skb(rtlpci->rxbuffersize);
+               if (unlikely(!new_skb)) {
+                       RT_TRACE(rtlpriv, (COMP_INTR | COMP_RECV),
+                                DBG_DMESG,
+                                ("can't alloc skb for rx\n"));
+                       goto done;
+               }
 
-                       skb_put(skb, rtlpriv->cfg->ops->get_desc((u8 *) pdesc,
-                                                        false,
-                                                        HW_DESC_RXPKT_LEN));
-                       skb_reserve(skb,
-                                   stats.rx_drvinfo_size + stats.rx_bufshift);
+               pci_unmap_single(rtlpci->pdev,
+                                *((dma_addr_t *) skb->cb),
+                                rtlpci->rxbuffersize,
+                                PCI_DMA_FROMDEVICE);
 
-                       /*
-                        *NOTICE This can not be use for mac80211,
-                        *this is done in mac80211 code,
-                        *if you done here sec DHCP will fail
-                        *skb_trim(skb, skb->len - 4);
-                        */
+               skb_put(skb, rtlpriv->cfg->ops->get_desc((u8 *) pdesc, false,
+                       HW_DESC_RXPKT_LEN));
+               skb_reserve(skb, stats.rx_drvinfo_size + stats.rx_bufshift);
 
-                       hdr = rtl_get_hdr(skb);
-                       fc = rtl_get_fc(skb);
+               /*
+                * NOTICE This can not be use for mac80211,
+                * this is done in mac80211 code,
+                * if you done here sec DHCP will fail
+                * skb_trim(skb, skb->len - 4);
+                */
+
+               hdr = rtl_get_hdr(skb);
+               fc = rtl_get_fc(skb);
 
-                       if (!stats.crc && !stats.hwerror) {
-                               memcpy(IEEE80211_SKB_RXCB(skb), &rx_status,
+               if (!stats.crc && !stats.hwerror) {
+                       memcpy(IEEE80211_SKB_RXCB(skb), &rx_status,
                                       sizeof(rx_status));
 
-                               if (is_broadcast_ether_addr(hdr->addr1)) {
-                                       ;/*TODO*/
-                               } else if (is_multicast_ether_addr(hdr->addr1)) {
-                                       ;/*TODO*/
-                               } else {
-                                       unicast = true;
-                                       rtlpriv->stats.rxbytesunicast +=
-                                           skb->len;
-                               }
+                       if (is_broadcast_ether_addr(hdr->addr1)) {
+                               ;/*TODO*/
+                       } else if (is_multicast_ether_addr(hdr->addr1)) {
+                               ;/*TODO*/
+                       } else {
+                               unicast = true;
+                               rtlpriv->stats.rxbytesunicast += skb->len;
+                       }
 
-                               rtl_is_special_data(hw, skb, false);
+                       rtl_is_special_data(hw, skb, false);
 
-                               if (ieee80211_is_data(fc)) {
-                                       rtlpriv->cfg->ops->led_control(hw,
-                                                              LED_CTL_RX);
+                       if (ieee80211_is_data(fc)) {
+                               rtlpriv->cfg->ops->led_control(hw, LED_CTL_RX);
 
-                                       if (unicast)
-                                               rtlpriv->link_info.
-                                                   num_rx_inperiod++;
-                               }
+                               if (unicast)
+                                       rtlpriv->link_info.num_rx_inperiod++;
+                       }
 
-                               /* for sw lps */
-                               rtl_swlps_beacon(hw, (void *)skb->data,
-                                                skb->len);
-                               rtl_recognize_peer(hw, (void *)skb->data,
-                                                  skb->len);
-                               if ((rtlpriv->mac80211.opmode ==
-                                    NL80211_IFTYPE_AP) &&
-                                   (rtlpriv->rtlhal.current_bandtype ==
-                                    BAND_ON_2_4G) &&
-                                    (ieee80211_is_beacon(fc) ||
-                                    ieee80211_is_probe_resp(fc))) {
+                       /* for sw lps */
+                       rtl_swlps_beacon(hw, (void *)skb->data, skb->len);
+                       rtl_recognize_peer(hw, (void *)skb->data, skb->len);
+                       if ((rtlpriv->mac80211.opmode == NL80211_IFTYPE_AP) &&
+                           (rtlpriv->rtlhal.current_bandtype ==
+                            BAND_ON_2_4G) &&
+                            (ieee80211_is_beacon(fc) ||
+                            ieee80211_is_probe_resp(fc))) {
+                               dev_kfree_skb_any(skb);
+                       } else {
+                               if (unlikely(!rtl_action_proc(hw, skb,
+                                   false))) {
                                        dev_kfree_skb_any(skb);
                                } else {
-                                       if (unlikely(!rtl_action_proc(hw, skb,
-                                           false))) {
-                                               dev_kfree_skb_any(skb);
-                                       } else {
-                                               struct sk_buff *uskb = NULL;
-                                               u8 *pdata;
-                                               uskb = dev_alloc_skb(skb->len
-                                                                    + 128);
-                                               memcpy(IEEE80211_SKB_RXCB(uskb),
-                                                      &rx_status,
-                                                      sizeof(rx_status));
-                                               pdata = (u8 *)skb_put(uskb,
-                                                       skb->len);
-                                               memcpy(pdata, skb->data,
-                                                      skb->len);
-                                               dev_kfree_skb_any(skb);
-
-                                               ieee80211_rx_irqsafe(hw, uskb);
-                                       }
+                                       struct sk_buff *uskb = NULL;
+                                       u8 *pdata;
+                                       uskb = dev_alloc_skb(skb->len + 128);
+                                       memcpy(IEEE80211_SKB_RXCB(uskb),
+                                              &rx_status, sizeof(rx_status));
+                                       pdata = (u8 *)skb_put(uskb, skb->len);
+                                       memcpy(pdata, skb->data, skb->len);
+                                       dev_kfree_skb_any(skb);
+
+                                       ieee80211_rx_irqsafe(hw, uskb);
                                }
-                       } else {
-                               dev_kfree_skb_any(skb);
                        }
+               } else {
+                       dev_kfree_skb_any(skb);
+               }
 
-                       if (((rtlpriv->link_info.num_rx_inperiod +
-                               rtlpriv->link_info.num_tx_inperiod) > 8) ||
-                               (rtlpriv->link_info.num_rx_inperiod > 2)) {
-                               tasklet_schedule(&rtlpriv->works.ips_leave_tasklet);
-                       }
+               if (((rtlpriv->link_info.num_rx_inperiod +
+                       rtlpriv->link_info.num_tx_inperiod) > 8) ||
+                       (rtlpriv->link_info.num_rx_inperiod > 2)) {
+                       tasklet_schedule(&rtlpriv->works.ips_leave_tasklet);
+               }
 
-                       skb = new_skb;
+               skb = new_skb;
 
-                       rtlpci->rx_ring[rx_queue_idx].rx_buf[index] = skb;
-                       *((dma_addr_t *) skb->cb) =
+               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,
                                           PCI_DMA_FROMDEVICE);
 
-               }
 done:
                bufferaddress = (*((dma_addr_t *)skb->cb));
                tmp_one = 1;