From 9d2429591517a031692385ee7c51ef84ea61654e Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Fri, 9 Jan 2009 13:01:06 +0000
Subject: [PATCH] --- yaml --- r: 133793 b: refs/heads/master c:
 3170c6568776a58e1eeec8ff949a65f5cf5d7ceb h: refs/heads/master i:   133791:
 f493a682019dab3336cc95fafe073bb2fbc59644 v: v3

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

diff --git a/[refs] b/[refs]
index 6b4d217cc3c0..7e778208c189 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d289d120b46d9b6c68448b1d1c6d3edb94cdbde6
+refs/heads/master: 3170c6568776a58e1eeec8ff949a65f5cf5d7ceb
diff --git a/trunk/net/rose/rose_dev.c b/trunk/net/rose/rose_dev.c
index ddb566707184..7dcf2569613b 100644
--- a/trunk/net/rose/rose_dev.c
+++ b/trunk/net/rose/rose_dev.c
@@ -149,18 +149,22 @@ static const struct header_ops rose_header_ops = {
 	.rebuild= rose_rebuild_header,
 };
 
+static const struct net_device_ops rose_netdev_ops = {
+	.ndo_open		= rose_open,
+	.ndo_stop		= rose_close,
+	.ndo_start_xmit		= rose_xmit,
+	.ndo_set_mac_address    = rose_set_mac_address,
+};
+
 void rose_setup(struct net_device *dev)
 {
 	dev->mtu		= ROSE_MAX_PACKET_SIZE - 2;
-	dev->hard_start_xmit	= rose_xmit;
-	dev->open		= rose_open;
-	dev->stop		= rose_close;
+	dev->netdev_ops		= &rose_netdev_ops;
 
 	dev->header_ops		= &rose_header_ops;
 	dev->hard_header_len	= AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN + ROSE_MIN_LEN;
 	dev->addr_len		= ROSE_ADDR_LEN;
 	dev->type		= ARPHRD_ROSE;
-	dev->set_mac_address    = rose_set_mac_address;
 
 	/* New-style flags. */
 	dev->flags		= IFF_NOARP;