summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDenis Kirjanov2009-11-30 02:04:31 +0100
committerDavid S. Miller2009-11-30 02:04:31 +0100
commit0ccfe64d3f177a61a071b7a6fa363f0a292158c4 (patch)
treeffd9196c83e8aef59251c17d86d51c74f98154de /drivers
parentnet: Move && and || to end of previous line (diff)
downloadkernel-qcow2-linux-0ccfe64d3f177a61a071b7a6fa363f0a292158c4.tar.gz
kernel-qcow2-linux-0ccfe64d3f177a61a071b7a6fa363f0a292158c4.tar.xz
kernel-qcow2-linux-0ccfe64d3f177a61a071b7a6fa363f0a292158c4.zip
mv643xx: convert to netdev_tx_t
Signed-off-by: Denis Kirjanov <kirjanov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/mv643xx_eth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index b62e61d4ca3e..796a493f95ab 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -849,7 +849,7 @@ no_csum:
return 0;
}
-static int mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct mv643xx_eth_private *mp = netdev_priv(dev);
int queue;