summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwmc3200wifi/rx.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-12-21 11:54:49 -0800
committerDavid S. Miller <davem@davemloft.net>2009-12-21 11:54:49 -0800
commited4b2019a62e2208a8370461dd91ed4de2c9fc8f (patch)
tree2910816b23718e9cebd20be9eae2b6876edd849b /drivers/net/wireless/iwmc3200wifi/rx.c
parentb74665606962456af7f92b1e448cee30ce70967b (diff)
parent92c6f8d849178582fc527aaf1e51dd37a74767d3 (diff)
downloadop-kernel-dev-ed4b2019a62e2208a8370461dd91ed4de2c9fc8f.zip
op-kernel-dev-ed4b2019a62e2208a8370461dd91ed4de2c9fc8f.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/rx.c')
-rw-r--r--drivers/net/wireless/iwmc3200wifi/rx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c
index 1c57c1f..6d6ed74 100644
--- a/drivers/net/wireless/iwmc3200wifi/rx.c
+++ b/drivers/net/wireless/iwmc3200wifi/rx.c
@@ -1126,7 +1126,7 @@ static int iwm_ntf_stop_resume_tx(struct iwm_priv *iwm, u8 *buf,
if (!stop) {
struct iwm_tx_queue *txq;
- u16 queue = iwm_tid_to_queue(bit);
+ int queue = iwm_tid_to_queue(bit);
if (queue < 0)
continue;
OpenPOWER on IntegriCloud