ipmr: convert ipmr virtual interface to net_device_ops

Stephen Hemminger · davem330 · commit 007c3838d9fd · 2008-11-20T20:28:35.000-08:00
Convert to new network device ops interface.

Signed-off-by: Stephen Hemminger &lt;shemminger@vyatta.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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
@@ -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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -222,12 +222,16 @@ static int reg_vif_xmit(struct sk_buff skb, struct net_device dev)`
`222`	`222`	`return 0;`
`223`	`223`	`}`
`224`	`224`
	`225`	`+static const struct net_device_ops reg_vif_netdev_ops = {`
	`226`	`+ .ndo_start_xmit = reg_vif_xmit,`
	`227`	`+};`
	`228`	`+`
`225`	`229`	`static void reg_vif_setup(struct net_device *dev)`
`226`	`230`	`{`
`227`	`231`	`dev->type = ARPHRD_PIMREG;`
`228`	`232`	`dev->mtu = ETH_DATA_LEN - sizeof(struct iphdr) - 8;`
`229`	`233`	`dev->flags = IFF_NOARP;`
`230`		`- dev->hard_start_xmit = reg_vif_xmit;`
	`234`	`+ dev->netdev_ops = &reg_vif_netdev_ops,`
`231`	`235`	`dev->destructor = free_netdev;`
`232`	`236`	`}`
`233`	`237`
Original file line number	Diff line number	Diff line change
`@@ -416,12 +416,16 @@ static int reg_vif_xmit(struct sk_buff skb, struct net_device dev)`
`416`	`416`	`return 0;`
`417`	`417`	`}`
`418`	`418`
	`419`	`+static const struct net_device_ops reg_vif_netdev_ops = {`
	`420`	`+ .ndo_start_xmit = reg_vif_xmit,`
	`421`	`+};`
	`422`	`+`
`419`	`423`	`static void reg_vif_setup(struct net_device *dev)`
`420`	`424`	`{`
`421`	`425`	`dev->type = ARPHRD_PIMREG;`
`422`	`426`	`dev->mtu = 1500 - sizeof(struct ipv6hdr) - 8;`
`423`	`427`	`dev->flags = IFF_NOARP;`
`424`		`- dev->hard_start_xmit = reg_vif_xmit;`
	`428`	`+ dev->netdev_ops = &reg_vif_netdev_ops;`
`425`	`429`	`dev->destructor = free_netdev;`
`426`	`430`	`}`
`427`	`431`