ipmr: convert ipmr virtual interface to net_device_ops

Convert to new network device ops interface.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index ee58bcbc99a5e59b0c0a22c331b6fe36ff513c09..77fc4d3fdf6129aa90ddf794c8fffa32ed56b548 100644 (file)
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -222,12 +222,16 @@ static int reg_vif_xmit(struct sk_buff *skb, struct net_device *dev)
        return 0;
 }
 
+static const struct net_device_ops reg_vif_netdev_ops = {
+       .ndo_start_xmit = reg_vif_xmit,
+};
+
 static void reg_vif_setup(struct net_device *dev)
 {
        dev->type               = ARPHRD_PIMREG;
        dev->mtu                = ETH_DATA_LEN - sizeof(struct iphdr) - 8;
        dev->flags              = IFF_NOARP;
-       dev->hard_start_xmit    = reg_vif_xmit;
+       dev->netdev_ops         = &reg_vif_netdev_ops,
        dev->destructor         = free_netdev;
 }
 

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 363ae258ee1e16d2745404561ca0885af933034e..dfba9fd0c248842a2b023c415e88e2c068fb32d0 100644 (file)
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -416,12 +416,16 @@ static int reg_vif_xmit(struct sk_buff *skb, struct net_device *dev)
        return 0;
 }
 
+static const struct net_device_ops reg_vif_netdev_ops = {
+       .ndo_start_xmit = reg_vif_xmit,
+};
+
 static void reg_vif_setup(struct net_device *dev)
 {
        dev->type               = ARPHRD_PIMREG;
        dev->mtu                = 1500 - sizeof(struct ipv6hdr) - 8;
        dev->flags              = IFF_NOARP;
-       dev->hard_start_xmit    = reg_vif_xmit;
+       dev->netdev_ops         = &reg_vif_netdev_ops;
        dev->destructor         = free_netdev;
 }