From 18a78b0afa2d0394d50a8e4518a16a4192d81ada Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 20 Nov 2008 20:28:35 -0800 Subject: [PATCH] --- yaml --- r: 121955 b: refs/heads/master c: 007c3838d9fdcc8fdaea87e4879ec3759f016ed5 h: refs/heads/master i: 121953: dbf88798bb4f4ef1169c091aa86b95b94021c873 121951: 96951015d56d6d93d5662dea1e767712b0b039ca v: v3 --- [refs] | 2 +- trunk/net/ipv4/ipmr.c | 6 +++++- trunk/net/ipv6/ip6mr.c | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 40dcc5c47f69..7a4ee9474b84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa18e9e88c863a58f6ea63eeee0e740be071fdcf +refs/heads/master: 007c3838d9fdcc8fdaea87e4879ec3759f016ed5 diff --git a/trunk/net/ipv4/ipmr.c b/trunk/net/ipv4/ipmr.c index ee58bcbc99a5..77fc4d3fdf61 100644 --- a/trunk/net/ipv4/ipmr.c +++ b/trunk/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 = ®_vif_netdev_ops, dev->destructor = free_netdev; } diff --git a/trunk/net/ipv6/ip6mr.c b/trunk/net/ipv6/ip6mr.c index 363ae258ee1e..dfba9fd0c248 100644 --- a/trunk/net/ipv6/ip6mr.c +++ b/trunk/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 = ®_vif_netdev_ops; dev->destructor = free_netdev; }