git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
irda
/
w83977af_ir.c
diff --git
a/drivers/net/irda/w83977af_ir.c
b/drivers/net/irda/w83977af_ir.c
index
fe4f2b2
..
462bc43
100644
(file)
--- a/
drivers/net/irda/w83977af_ir.c
+++ b/
drivers/net/irda/w83977af_ir.c
@@
-516,7
+516,7
@@
static int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev)
w83977af_change_speed(self, speed);
dev->trans_start = jiffies;
dev_kfree_skb(skb);
- return
0
;
+ return
NETDEV_TX_OK
;
} else
self->new_speed = speed;
}
@@
-576,7
+576,7
@@
static int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev)
/* Restore set register */
outb(set, iobase+SSR);
- return
0
;
+ return
NETDEV_TX_OK
;
}
/*