This is an attempt to fix bcm43xx driver. It is for DMA mode only and
incomplete even for that mode - ieee80211_hw->tx() callback should return
NETDEV_TX_* constants which is not completely fixed by this patch.
---
drivers/net/wireless/d80211/bcm43xx/bcm43xx_dma.c | 6 +++++-
drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
--- dscape.orig/drivers/net/wireless/d80211/bcm43xx/bcm43xx_dma.c
+++ dscape/drivers/net/wireless/d80211/bcm43xx/bcm43xx_dma.c
@@ -778,13 +778,16 @@ int bcm43xx_dma_tx(struct bcm43xx_privat
* recognizes if the device queue is full and does
* not send data anymore.
*/
+ ieee80211_stop_queue(bcm->net_dev, 0);
printk(KERN_ERR PFX "DMA queue overflow\n");
- return -ENOMEM;
+ return NETDEV_TX_BUSY;
}
err = dma_tx_fragment(ring, skb, ctl);
if (likely(!err))
ring->nr_tx_packets++;
+ if (free_slots(ring) < SLOTS_PER_PACKET)
+ ieee80211_stop_queue(bcm->net_dev, 0);
return err;
}
@@ -833,6 +836,7 @@ void bcm43xx_dma_handle_xmitstatus(struc
slot = next_slot(ring, slot);
}
bcm->stats.last_tx = jiffies;
+ ieee80211_wake_queue(bcm->net_dev, 0);
}
void bcm43xx_dma_get_tx_stats(struct bcm43xx_private *bcm,
--- dscape.orig/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c
+++ dscape/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c
@@ -3737,6 +3737,7 @@ static int bcm43xx_init_board(struct bcm
bcm43xx_security_init(bcm);
bcm43xx_measure_channel_change_time(bcm);
ieee80211_update_hw(bcm->net_dev, bcm->ieee);
+ ieee80211_start_queues(bcm->net_dev);
ieee80211_netif_oper(bcm->net_dev, NETIF_ATTACH);
ieee80211_netif_oper(bcm->net_dev, NETIF_START);
ieee80211_netif_oper(bcm->net_dev, NETIF_WAKE);
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
