summaryrefslogtreecommitdiffstats
path: root/drivers/net/tun.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 21:50:51 +0200
committerDavid S. Miller <davem@davemloft.net>2009-09-01 10:13:40 +0200
commit424efe9caf6047ffbcd6b383ff4d2347254aabf1 (patch)
treed0ed516baa5b452ed8bc3a88fbd061f6e415bfb9 /drivers/net/tun.c
parentirda: convert to netdev_tx_t (diff)
downloadlinux-424efe9caf6047ffbcd6b383ff4d2347254aabf1.tar.xz
linux-424efe9caf6047ffbcd6b383ff4d2347254aabf1.zip
netdev: convert pseudo drivers to netdev_tx_t
These are all drivers that don't touch real hardware. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r--drivers/net/tun.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 2533f5cf2e4b..5f7842e4d4ae 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -358,7 +358,7 @@ static int tun_net_close(struct net_device *dev)
}
/* Net device start xmit */
-static int tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct tun_struct *tun = netdev_priv(dev);