iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtlwifi: Remove unnecessary indent

Browse Source 
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Mike McCormack 2011-06-06 23:12:08 +09:00 committed by John W. Linville
parent 1d34d108e0
commit 2c333366a4
1 changed files with 78 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/net/wireless/rtlwifi/pci.c
View File

@ -654,17 +654,16 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
/*rx pkt */ /*rx pkt */
struct sk_buff *skb = rtlpci->rx_ring[rx_queue_idx].rx_buf[ struct sk_buff *skb = rtlpci->rx_ring[rx_queue_idx].rx_buf[
index]; index];
struct ieee80211_hdr *hdr;
__le16 fc;
struct sk_buff *new_skb = NULL;
own = (u8) rtlpriv->cfg->ops->get_desc((u8 *) pdesc, own = (u8) rtlpriv->cfg->ops->get_desc((u8 *) pdesc,
false, HW_DESC_OWN); false, HW_DESC_OWN);
if (own) {
/*wait data to be filled by hardware */ /*wait data to be filled by hardware */
if (own)
break; break;
} else {
struct ieee80211_hdr *hdr;
__le16 fc;
struct sk_buff *new_skb = NULL;
rtlpriv->cfg->ops->query_rx_desc(hw, &stats, rtlpriv->cfg->ops->query_rx_desc(hw, &stats,
&rx_status, &rx_status,
@ -683,17 +682,15 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
rtlpci->rxbuffersize, rtlpci->rxbuffersize,
PCI_DMA_FROMDEVICE); PCI_DMA_FROMDEVICE);
skb_put(skb, rtlpriv->cfg->ops->get_desc((u8 *) pdesc, skb_put(skb, rtlpriv->cfg->ops->get_desc((u8 *) pdesc, false,
false,
HW_DESC_RXPKT_LEN)); HW_DESC_RXPKT_LEN));
skb_reserve(skb, skb_reserve(skb, stats.rx_drvinfo_size + stats.rx_bufshift);
stats.rx_drvinfo_size + stats.rx_bufshift);
/* /*
*NOTICE This can not be use for mac80211, * NOTICE This can not be use for mac80211,
*this is done in mac80211 code, * this is done in mac80211 code,
*if you done here sec DHCP will fail * if you done here sec DHCP will fail
*skb_trim(skb, skb->len - 4); * skb_trim(skb, skb->len - 4);
*/ */
hdr = rtl_get_hdr(skb); hdr = rtl_get_hdr(skb);
@ -709,28 +706,22 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
;/*TODO*/ ;/*TODO*/
} else { } else {
unicast = true; unicast = true;
rtlpriv->stats.rxbytesunicast += rtlpriv->stats.rxbytesunicast += skb->len;
skb->len;
} }
rtl_is_special_data(hw, skb, false); rtl_is_special_data(hw, skb, false);
if (ieee80211_is_data(fc)) { if (ieee80211_is_data(fc)) {
rtlpriv->cfg->ops->led_control(hw, rtlpriv->cfg->ops->led_control(hw, LED_CTL_RX);
LED_CTL_RX);
if (unicast) if (unicast)
rtlpriv->link_info. rtlpriv->link_info.num_rx_inperiod++;
num_rx_inperiod++;
} }
/* for sw lps */ /* for sw lps */
rtl_swlps_beacon(hw, (void *)skb->data, rtl_swlps_beacon(hw, (void *)skb->data, skb->len);
skb->len); rtl_recognize_peer(hw, (void *)skb->data, skb->len);
rtl_recognize_peer(hw, (void *)skb->data, if ((rtlpriv->mac80211.opmode == NL80211_IFTYPE_AP) &&
skb->len);
if ((rtlpriv->mac80211.opmode ==
NL80211_IFTYPE_AP) &&
(rtlpriv->rtlhal.current_bandtype == (rtlpriv->rtlhal.current_bandtype ==
BAND_ON_2_4G) && BAND_ON_2_4G) &&
(ieee80211_is_beacon(fc) || (ieee80211_is_beacon(fc) ||
@ -743,15 +734,11 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
} else { } else {
struct sk_buff *uskb = NULL; struct sk_buff *uskb = NULL;
u8 *pdata; u8 *pdata;
uskb = dev_alloc_skb(skb->len uskb = dev_alloc_skb(skb->len + 128);
+ 128);
memcpy(IEEE80211_SKB_RXCB(uskb), memcpy(IEEE80211_SKB_RXCB(uskb),
&rx_status, &rx_status, sizeof(rx_status));
sizeof(rx_status)); pdata = (u8 *)skb_put(uskb, skb->len);
pdata = (u8 *)skb_put(uskb, memcpy(pdata, skb->data, skb->len);
skb->len);
memcpy(pdata, skb->data,
skb->len);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
ieee80211_rx_irqsafe(hw, uskb); ieee80211_rx_irqsafe(hw, uskb);
@ -775,7 +762,6 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
rtlpci->rxbuffersize, rtlpci->rxbuffersize,
PCI_DMA_FROMDEVICE); PCI_DMA_FROMDEVICE);
}
done: done:
bufferaddress = (*((dma_addr_t *)skb->cb)); bufferaddress = (*((dma_addr_t *)skb->cb));
tmp_one = 1; tmp_one = 1;