From 5bf25abfc1cb05166bbb9491525ae49844691663 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed, 19 Nov 2008 21:50:10 -0800
Subject: [PATCH] --- yaml --- r: 121897 b: refs/heads/master c:
 4456e7bdf74c9f27e2312a6f197b2da467541433 h: refs/heads/master i:   121895:
 4e3c3ab170cc4cc980d815f920b1605826ef98ca v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/net/veth.c | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7f7fdb486149..0b7fcc5eea18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2dbb88210b9877f1c53d3798fd5d717a4d45256
+refs/heads/master: 4456e7bdf74c9f27e2312a6f197b2da467541433
diff --git a/trunk/drivers/net/veth.c b/trunk/drivers/net/veth.c
index 75b40fefc4ee..4f93a55aaaa5 100644
--- a/trunk/drivers/net/veth.c
+++ b/trunk/drivers/net/veth.c
@@ -262,16 +262,20 @@ static void veth_dev_free(struct net_device *dev)
 	free_netdev(dev);
 }
 
+static const struct net_device_ops veth_netdev_ops = {
+	.ndo_init	= veth_dev_init,
+	.ndo_open	= veth_open,
+	.ndo_get_stats	= veth_get_stats,
+};
+
 static void veth_setup(struct net_device *dev)
 {
 	ether_setup(dev);
 
+	dev->netdev_ops = &veth_netdev_ops;
 	dev->hard_start_xmit = veth_xmit;
-	dev->get_stats = veth_get_stats;
-	dev->open = veth_open;
 	dev->ethtool_ops = &veth_ethtool_ops;
 	dev->features |= NETIF_F_LLTX;
-	dev->init = veth_dev_init;
 	dev->destructor = veth_dev_free;
 }
 
@@ -297,7 +301,7 @@ static int veth_device_event(struct notifier_block *unused,
 {
 	struct net_device *dev = ptr;
 
-	if (dev->open != veth_open)
+	if (dev->netdev_ops->ndo_open != veth_open)
 		goto out;
 
 	switch (event) {