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/meth.c | |
| parent | bf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd (diff) | |
| parent | 99bc47067910f7070e65ee318a6dd79a2371f1e5 (diff) | |
| download | lwn-ac8d513a6801c8636922ccf4f30211810c9a56ce.tar.gz lwn-ac8d513a6801c8636922ccf4f30211810c9a56ce.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/net/meth.c')
| -rw-r--r-- | drivers/net/meth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/meth.c b/drivers/net/meth.c index 5d04d94f2a21..92ceb689b4d4 100644 --- a/drivers/net/meth.c +++ b/drivers/net/meth.c @@ -715,7 +715,7 @@ static int meth_tx(struct sk_buff *skb, struct net_device *dev) spin_unlock_irqrestore(&priv->meth_lock, flags); - return 0; + return NETDEV_TX_OK; } /* @@ -784,7 +784,7 @@ static const struct net_device_ops meth_netdev_ops = { /* * The init function. */ -static int __init meth_probe(struct platform_device *pdev) +static int __devinit meth_probe(struct platform_device *pdev) { struct net_device *dev; struct meth_private *priv; |