git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
wireless
/
iwmc3200wifi
/
netdev.c
diff --git
a/drivers/net/wireless/iwmc3200wifi/netdev.c
b/drivers/net/wireless/iwmc3200wifi/netdev.c
index e4f0f8705f65c29b3935d81e5dc481b1f0b0055d..c4c0d23c63ecbcefc6a8b7896849bbd779ece0dc 100644
(file)
--- 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;