diff options
| author | John W. Linville <linville@tuxdriver.com> | 2009-12-28 15:09:11 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-28 15:09:11 -0500 |
| commit | ea1e4b842049fcc4741096538114871a74859314 (patch) | |
| tree | c2336ab480ac0fd62e0dc41b391d99c97158dc9c /drivers/net/wireless/iwmc3200wifi | |
| parent | b6ce5c33001b1dc83e6a1a6f30c5dccccea651b6 (diff) | |
| parent | 92c6f8d849178582fc527aaf1e51dd37a74767d3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi')
| -rw-r--r-- | drivers/net/wireless/iwmc3200wifi/iwm.h | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/iwmc3200wifi/netdev.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/iwmc3200wifi/rx.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/iwm.h b/drivers/net/wireless/iwmc3200wifi/iwm.h index 5a26bb05a33a..79ffa3b98d73 100644 --- a/drivers/net/wireless/iwmc3200wifi/iwm.h +++ b/drivers/net/wireless/iwmc3200wifi/iwm.h @@ -349,7 +349,7 @@ int iwm_up(struct iwm_priv *iwm); int iwm_down(struct iwm_priv *iwm); /* TX API */ -u16 iwm_tid_to_queue(u16 tid); +int iwm_tid_to_queue(u16 tid); void iwm_tx_credit_inc(struct iwm_priv *iwm, int id, int total_freed_pages); void iwm_tx_worker(struct work_struct *work); int iwm_xmit_frame(struct sk_buff *skb, struct net_device *netdev); diff --git a/drivers/net/wireless/iwmc3200wifi/netdev.c b/drivers/net/wireless/iwmc3200wifi/netdev.c index e4f0f8705f65..c4c0d23c63ec 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; diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c index 0619d6a1103c..fd399e6b1930 100644 --- a/drivers/net/wireless/iwmc3200wifi/rx.c +++ b/drivers/net/wireless/iwmc3200wifi/rx.c @@ -1125,7 +1125,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; |