diff options
author | David S. Miller <davem@davemloft.net> | 2009-12-21 11:54:49 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-21 11:54:49 -0800 |
commit | ed4b2019a62e2208a8370461dd91ed4de2c9fc8f (patch) | |
tree | 2910816b23718e9cebd20be9eae2b6876edd849b /drivers/net/wireless/iwmc3200wifi/netdev.c | |
parent | b74665606962456af7f92b1e448cee30ce70967b (diff) | |
parent | 92c6f8d849178582fc527aaf1e51dd37a74767d3 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/netdev.c')
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/netdev.c b/drivers/net/wireless/iwmc3200wifi/netdev.c index e4f0f8705f6..c4c0d23c63e 100644 --- a/drivers/net/wireless/iwmc3200wifi/netdev.c +++ b/drivers/net/wireless/iwmc3200wifi/netdev.c @@ -76,7 +76,7 @@ static int iwm_stop(struct net_device *ndev) */ static const u16 iwm_1d_to_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; -u16 iwm_tid_to_queue(u16 tid) +int iwm_tid_to_queue(u16 tid) { if (tid > IWM_UMAC_TID_NR - 2) return -EINVAL; |