diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-14 20:26:05 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-14 20:26:05 +0200 |
| commit | ac8d513a6801c8636922ccf4f30211810c9a56ce (patch) | |
| tree | 83ba584487a6a612c8fcf2563c28c0263df35ba2 /drivers/net/sun3lance.c | |
| parent | bf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd (diff) | |
| parent | 99bc47067910f7070e65ee318a6dd79a2371f1e5 (diff) | |
| download | linux-ac8d513a6801c8636922ccf4f30211810c9a56ce.tar.gz linux-ac8d513a6801c8636922ccf4f30211810c9a56ce.tar.bz2 linux-ac8d513a6801c8636922ccf4f30211810c9a56ce.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/net/sun3lance.c')
| -rw-r--r-- | drivers/net/sun3lance.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c index 534dfe3eef6f..0ca4241b4f63 100644 --- a/drivers/net/sun3lance.c +++ b/drivers/net/sun3lance.c @@ -562,7 +562,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev ) netif_start_queue(dev); dev->trans_start = jiffies; - return 0; + return NETDEV_TX_OK; } @@ -648,7 +648,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev ) local_irq_restore(flags); - return 0; + return NETDEV_TX_OK; } /* The LANCE interrupt handler. */ |