diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 19:50:41 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-01 01:13:07 -0700 |
| commit | 6fef4c0c8eeff7de13007a5f56113475444a253d (patch) | |
| tree | 216bafb88ab84c5e0a048598cd6c05f7eb8f438d /net/ipv6/sit.c | |
| parent | dc1f8bf68b311b1537cb65893430b6796118498a (diff) | |
| download | talos-op-linux-6fef4c0c8eeff7de13007a5f56113475444a253d.tar.gz talos-op-linux-6fef4c0c8eeff7de13007a5f56113475444a253d.zip | |
netdev: convert pseudo-devices to netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 1d25a4dff0af..0ae4f6448187 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -609,7 +609,8 @@ static inline __be32 try_6to4(struct in6_addr *v6dst) * and that skb is filled properly by that function. */ -static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, + struct net_device *dev) { struct ip_tunnel *tunnel = netdev_priv(dev); struct net_device_stats *stats = &tunnel->dev->stats; |
