diff options
| author | Javier Cardona <javier@cozybit.com> | 2007-05-25 12:06:56 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2007-06-11 14:28:38 -0400 |
| commit | 51d84f501684db22f5fcc30821cbbde2a0a2f264 (patch) | |
| tree | e8cc735e7a285fc753dbee4f6d2cfe7d08d69023 /drivers/net/wireless/libertas/tx.c | |
| parent | 32a74b7c8f7b883b532e0e4333b7c3014d3d8fe8 (diff) | |
| download | linux-51d84f501684db22f5fcc30821cbbde2a0a2f264.tar.gz linux-51d84f501684db22f5fcc30821cbbde2a0a2f264.tar.bz2 linux-51d84f501684db22f5fcc30821cbbde2a0a2f264.zip | |
[PATCH] libertas: fixed transmission flow control on the mesh interface
This patch implements proper transmission flow control on mshX.
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/tx.c')
| -rw-r--r-- | drivers/net/wireless/libertas/tx.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c index 964321fd5e69..e61729f0645a 100644 --- a/drivers/net/wireless/libertas/tx.c +++ b/drivers/net/wireless/libertas/tx.c @@ -159,6 +159,7 @@ done: skb_orphan(skb); /* stop processing outgoing pkts */ netif_stop_queue(priv->wlan_dev.netdev); + netif_stop_queue(priv->mesh_dev); /* freeze any packets already in our queues */ priv->adapter->TxLockFlag = 1; } else { @@ -195,10 +196,13 @@ static void wlan_tx_queue(wlan_private *priv, struct sk_buff *skb) WARN_ON(priv->adapter->tx_queue_idx >= NR_TX_QUEUE); adapter->tx_queue_ps[adapter->tx_queue_idx++] = skb; - if (adapter->tx_queue_idx == NR_TX_QUEUE) + if (adapter->tx_queue_idx == NR_TX_QUEUE) { netif_stop_queue(priv->wlan_dev.netdev); - else + netif_stop_queue(priv->mesh_dev); + } else { netif_start_queue(priv->wlan_dev.netdev); + netif_start_queue(priv->mesh_dev); + } spin_unlock(&adapter->txqueue_lock); } @@ -279,6 +283,8 @@ void libertas_send_tx_feedback(wlan_private * priv) libertas_upload_rx_packet(priv, adapter->currenttxskb); adapter->currenttxskb = NULL; priv->adapter->TxLockFlag = 0; - if (priv->adapter->connect_status == libertas_connected) + if (priv->adapter->connect_status == libertas_connected) { netif_wake_queue(priv->wlan_dev.netdev); + netif_wake_queue(priv->mesh_dev); + } } |