diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 00:06:59 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 00:06:59 -0400 |
| commit | 71fd68e7d234f6b7d8407c8f486764d24f8411f4 (patch) | |
| tree | 6dc2a4c356b4f454fc85d0c7cb019986f6f4993b /drivers/net/irda/sa1100_ir.c | |
| parent | 8ff0e082f0833d32c7523a6cd72b6cf6a2142ce8 (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'drivers/net/irda/sa1100_ir.c')
| -rw-r--r-- | drivers/net/irda/sa1100_ir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c index b039cb081e94..38bf7cf2256d 100644 --- a/drivers/net/irda/sa1100_ir.c +++ b/drivers/net/irda/sa1100_ir.c @@ -666,7 +666,7 @@ static int sa1100_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev) sa1100_irda_set_speed(si, speed); } dev_kfree_skb(skb); - return 0; + return NETDEV_TX_OK; } if (!IS_FIR(si)) { @@ -714,7 +714,7 @@ static int sa1100_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies; - return 0; + return NETDEV_TX_OK; } static int |