diff options
| author | James Morris <jmorris@namei.org> | 2009-06-19 08:20:55 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-19 08:20:55 +1000 |
| commit | d905163c5b23f6d8511971e06081a1b525e8a0bd (patch) | |
| tree | f76918c1be802ec068d37763466f5518efdb690e /net/rose/rose_dev.c | |
| parent | 44c2d9bdd7022ca7d240d5adc009296fc1c6ce08 (diff) | |
| parent | 0732f87761dbe417cb6e084b712d07e879e876ef (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'net/rose/rose_dev.c')
| -rw-r--r-- | net/rose/rose_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rose/rose_dev.c b/net/rose/rose_dev.c index 7dcf2569613b..389d6e0d7740 100644 --- a/net/rose/rose_dev.c +++ b/net/rose/rose_dev.c @@ -137,7 +137,7 @@ static int rose_xmit(struct sk_buff *skb, struct net_device *dev) if (!netif_running(dev)) { printk(KERN_ERR "ROSE: rose_xmit - called when iface is down\n"); - return 1; + return NETDEV_TX_BUSY; } dev_kfree_skb(skb); stats->tx_errors++; |