From e6f456c41d3d44c8aa65b6649317af4eff4a52b3 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Fri, 20 Mar 2009 19:36:15 +0000
Subject: [PATCH] --- yaml --- r: 135423 b: refs/heads/master c:
 49e8abaf62dc6403f11313e8fefbc0f5e7a9f50f h: refs/heads/master i:   135421:
 463054214ef35891e3eac7059af5daddf9b85852   135419:
 5c15419c12a6f7e56d82a66f3713d810922cfb60   135415:
 cbe1b0d2fa61a5acc019b6db5c576863084f4e92   135407:
 e3d5fa4b1d5fbf0f1b120bffc1a843e7412c280f   135391:
 6a37b097be1c91dc9e557448d8fabaeddaacdbb4   135359:
 994a6eea3e6893bb5b51989c896c75755c4e2932   135295:
 0570e76bda338016eea7349b8ebfeaae71822beb   135167:
 2e3fa839e5d5bbce1870a1480804e1abcc3f411a v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/net/wan/dlci.c | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 40ad3054efac..c71550701f4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07d117cf0a2c71160d3fcc0068d1f1fe1237c47a
+refs/heads/master: 49e8abaf62dc6403f11313e8fefbc0f5e7a9f50f
diff --git a/trunk/drivers/net/wan/dlci.c b/trunk/drivers/net/wan/dlci.c
index a1b0b0d7391a..e8d155c3e59f 100644
--- a/trunk/drivers/net/wan/dlci.c
+++ b/trunk/drivers/net/wan/dlci.c
@@ -200,7 +200,7 @@ static int dlci_transmit(struct sk_buff *skb, struct net_device *dev)
 
 	netif_stop_queue(dev);
 	
-	ret = dlp->slave->hard_start_xmit(skb, dlp->slave);
+	ret = dlp->slave->netdev_ops->ndo_start_xmit(skb, dlp->slave);
 	switch (ret)
 	{
 		case DLCI_RET_OK:
@@ -295,11 +295,9 @@ static int dlci_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 
 static int dlci_change_mtu(struct net_device *dev, int new_mtu)
 {
-	struct dlci_local *dlp;
-
-	dlp = netdev_priv(dev);
+	struct dlci_local *dlp = netdev_priv(dev);
 
-	return((*dlp->slave->change_mtu)(dlp->slave, new_mtu));
+	return dev_set_mtu(dlp->slave, new_mtu);
 }
 
 static int dlci_open(struct net_device *dev)
@@ -479,17 +477,21 @@ static const struct header_ops dlci_header_ops = {
 	.create	= dlci_header,
 };
 
+static const struct net_device_ops dlci_netdev_ops = {
+	.ndo_open	= dlci_open,
+	.ndo_stop	= dlci_close,
+	.ndo_do_ioctl	= dlci_dev_ioctl,
+	.ndo_start_xmit	= dlci_transmit,
+	.ndo_change_mtu	= dlci_change_mtu,
+};
+
 static void dlci_setup(struct net_device *dev)
 {
 	struct dlci_local *dlp = netdev_priv(dev);
 
 	dev->flags		= 0;
-	dev->open		= dlci_open;
-	dev->stop		= dlci_close;
-	dev->do_ioctl		= dlci_dev_ioctl;
-	dev->hard_start_xmit	= dlci_transmit;
 	dev->header_ops		= &dlci_header_ops;
-	dev->change_mtu		= dlci_change_mtu;
+	dev->netdev_ops		= &dlci_netdev_ops;
 	dev->destructor		= free_netdev;
 
 	dlp->receive		= dlci_receive;