Commit a922a4b7 authored by Mike McCormack's avatar Mike McCormack Committed by Greg Kroah-Hartman

Staging: rtl8192e: Clean formatting in rtl8192_hard_start_xmit()

Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1f1f19ff
...@@ -1049,18 +1049,18 @@ static int rtl8192_hard_start_xmit(struct sk_buff *skb,struct net_device *dev) ...@@ -1049,18 +1049,18 @@ 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) static void rtl8192_tx_isr(struct net_device *dev, int prio)
{ {
struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
struct rtl8192_tx_ring *ring = &priv->tx_ring[prio]; struct rtl8192_tx_ring *ring = &priv->tx_ring[prio];
while (skb_queue_len(&ring->queue)) { while (skb_queue_len(&ring->queue)) {
tx_desc_819x_pci *entry = &ring->desc[ring->idx]; tx_desc_819x_pci *entry = &ring->desc[ring->idx];
struct sk_buff *skb; struct sk_buff *skb;
/* beacon packet will only use the first descriptor defaultly, /*
* beacon packet will only use the first descriptor defaultly,
* and the OWN may not be cleared by the hardware * and the OWN may not be cleared by the hardware
* */ */
if(prio != BEACON_QUEUE) { if (prio != BEACON_QUEUE) {
if(entry->OWN) if (entry->OWN)
return; return;
ring->idx = (ring->idx + 1) % ring->entries; ring->idx = (ring->idx + 1) % ring->entries;
} }
...@@ -1071,20 +1071,19 @@ static void rtl8192_tx_isr(struct net_device *dev, int prio) ...@@ -1071,20 +1071,19 @@ static void rtl8192_tx_isr(struct net_device *dev, int prio)
kfree_skb(skb); kfree_skb(skb);
} }
if (prio == MGNT_QUEUE){ if (prio == MGNT_QUEUE) {
if (priv->ieee80211->ack_tx_to_ieee){ if (priv->ieee80211->ack_tx_to_ieee) {
if (rtl8192_is_tx_queue_empty(dev)){ if (rtl8192_is_tx_queue_empty(dev)) {
priv->ieee80211->ack_tx_to_ieee = 0; priv->ieee80211->ack_tx_to_ieee = 0;
ieee80211_ps_tx_ack(priv->ieee80211, 1); ieee80211_ps_tx_ack(priv->ieee80211, 1);
} }
} }
} }
if(prio != BEACON_QUEUE) { if (prio != BEACON_QUEUE) {
/* try to deal with the pending packets */ /* try to deal with the pending packets */
tasklet_schedule(&priv->irq_tx_tasklet); tasklet_schedule(&priv->irq_tx_tasklet);
} }
} }
static void rtl8192_stop_beacon(struct net_device *dev) static void rtl8192_stop_beacon(struct net_device *dev)
......
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