diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-11-22 15:28:30 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-11-22 15:28:30 -0500 |
| commit | 840fd8ff64f7b6c9cbfa9b7d0419f015f33303ff (patch) | |
| tree | bcdc472c9b794f1d141534c14dcb0dd17015f030 /drivers/net/wireless/iwlwifi/iwl3945-base.c | |
| parent | b84a7d3d9e7cd5a25f4fd32142cebdf4481a74a4 (diff) | |
| parent | 9e2e7422d059f9b98c3a0810df92a1ff660ade2f (diff) | |
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 6d09c0965645..c3ebc04cbd00 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
| @@ -655,7 +655,7 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | |||
| 655 | spin_unlock_irqrestore(&priv->lock, flags); | 655 | spin_unlock_irqrestore(&priv->lock, flags); |
| 656 | } | 656 | } |
| 657 | 657 | ||
| 658 | iwl_stop_queue(priv, skb_get_queue_mapping(skb)); | 658 | iwl_stop_queue(priv, txq); |
| 659 | } | 659 | } |
| 660 | 660 | ||
| 661 | return 0; | 661 | return 0; |