diff options
author | Mike McCormack <mikem@ring3k.org> | 2010-09-24 09:39:50 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-30 06:15:19 (GMT) |
commit | a922a4b778dc94f697b18aac85425340ca3aeffc (patch) | |
tree | f4a45859bfcf4f717504c30f030fa657577ae3bb /drivers/staging | |
parent | 1f1f19ff628ac3936f88465efb07efde0a4e5a5a (diff) | |
download | linux-fsl-qoriq-a922a4b778dc94f697b18aac85425340ca3aeffc.tar.xz |
Staging: rtl8192e: Clean formatting in rtl8192_hard_start_xmit()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/rtl8192e/r8192E_core.c | 63 |
1 files changed, 31 insertions, 32 deletions
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index adbf41b..94aaa2e 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c @@ -1048,43 +1048,42 @@ static int rtl8192_hard_start_xmit(struct sk_buff *skb,struct net_device *dev) static void rtl8192_tx_isr(struct net_device *dev, int prio) { - struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); - - struct rtl8192_tx_ring *ring = &priv->tx_ring[prio]; - - while (skb_queue_len(&ring->queue)) { - tx_desc_819x_pci *entry = &ring->desc[ring->idx]; - struct sk_buff *skb; + struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); + struct rtl8192_tx_ring *ring = &priv->tx_ring[prio]; - /* beacon packet will only use the first descriptor defaultly, - * and the OWN may not be cleared by the hardware - * */ - if(prio != BEACON_QUEUE) { - if(entry->OWN) - return; - ring->idx = (ring->idx + 1) % ring->entries; - } + while (skb_queue_len(&ring->queue)) { + tx_desc_819x_pci *entry = &ring->desc[ring->idx]; + struct sk_buff *skb; - skb = __skb_dequeue(&ring->queue); - pci_unmap_single(priv->pdev, le32_to_cpu(entry->TxBuffAddr), - skb->len, PCI_DMA_TODEVICE); + /* + * beacon packet will only use the first descriptor defaultly, + * and the OWN may not be cleared by the hardware + */ + if (prio != BEACON_QUEUE) { + if (entry->OWN) + return; + ring->idx = (ring->idx + 1) % ring->entries; + } - kfree_skb(skb); - } - if (prio == MGNT_QUEUE){ - if (priv->ieee80211->ack_tx_to_ieee){ - if (rtl8192_is_tx_queue_empty(dev)){ - priv->ieee80211->ack_tx_to_ieee = 0; - ieee80211_ps_tx_ack(priv->ieee80211, 1); - } - } - } + skb = __skb_dequeue(&ring->queue); + pci_unmap_single(priv->pdev, le32_to_cpu(entry->TxBuffAddr), + skb->len, PCI_DMA_TODEVICE); - if(prio != BEACON_QUEUE) { - /* try to deal with the pending packets */ - tasklet_schedule(&priv->irq_tx_tasklet); - } + kfree_skb(skb); + } + if (prio == MGNT_QUEUE) { + if (priv->ieee80211->ack_tx_to_ieee) { + if (rtl8192_is_tx_queue_empty(dev)) { + priv->ieee80211->ack_tx_to_ieee = 0; + ieee80211_ps_tx_ack(priv->ieee80211, 1); + } + } + } + if (prio != BEACON_QUEUE) { + /* try to deal with the pending packets */ + tasklet_schedule(&priv->irq_tx_tasklet); + } } static void rtl8192_stop_beacon(struct net_device *dev) |