commit 6fef4c0c8eeff7de13007a5f56113475444a253d
author Stephen Hemminger <shemminger@vyatta.com> Mon Aug 31 19:50:41 2009 +0000
committer David S. Miller <davem@davemloft.net> Tue Sep 01 01:13:07 2009 -0700
tree 216bafb88ab84c5e0a048598cd6c05f7eb8f438d
parent dc1f8bf68b311b1537cb65893430b6796118498a

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>

net/ipv4/ipmr.c

diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 06c33fb..65d421c 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -201,7 +201,7 @@
 
 #ifdef CONFIG_IP_PIMSM
 
-static int reg_vif_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t reg_vif_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct net *net = dev_net(dev);