aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan/x25_asy.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 19:50:47 +0000
committerDavid S. Miller <davem@davemloft.net>2009-09-01 01:13:28 -0700
commitd71a674922e7519edb477ecb585e7d29d69c7aa7 (patch)
tree816f6936957d5dbe2670079f64bdbd1f52cec00d /drivers/net/wan/x25_asy.c
parenttokenring: convert to netdev_tx_t (diff)
downloadlinux-dev-d71a674922e7519edb477ecb585e7d29d69c7aa7.tar.xz
linux-dev-d71a674922e7519edb477ecb585e7d29d69c7aa7.zip
wan: convert drivers to netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan/x25_asy.c')
-rw-r--r--drivers/net/wan/x25_asy.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 1047920e742c..27945049c9e1 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -299,7 +299,8 @@ static void x25_asy_timeout(struct net_device *dev)
/* Encapsulate an IP datagram and kick it into a TTY queue. */
-static int x25_asy_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t x25_asy_xmit(struct sk_buff *skb,
+ struct net_device *dev)
{
struct x25_asy *sl = netdev_priv(dev);
int err;