---

yaml --- r: 133791 b: refs/heads/master c: 0f6c5c8 h: refs/heads/master i: 133789: 9d10053 133787: aa48b08 133783: 6c5a4d5 133775: efc0e7b 133759: d58655d v: v3
git-mirror · Jan 21, 2009 · f493a68 · f493a68
1 parent 1b28ddc
commit f493a68
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b51414b69148433a79af5dc93463a0489492a788
+refs/heads/master: 0f6c5c8e79781974c0e660fd8bfc659b101b44fd
diff --git a/trunk/net/netrom/nr_dev.c b/trunk/net/netrom/nr_dev.c
@@ -191,19 +191,21 @@ static const struct header_ops nr_header_ops = {
 	.rebuild= nr_rebuild_header,
 };
 
+static const struct net_device_ops nr_netdev_ops = {
+	.ndo_open		= nr_open,
+	.ndo_stop		= nr_close,
+	.ndo_start_xmit		= nr_xmit,
+	.ndo_set_mac_address    = nr_set_mac_address,
+};
 
 void nr_setup(struct net_device *dev)
 {
 	dev->mtu		= NR_MAX_PACKET_SIZE;
-	dev->hard_start_xmit	= nr_xmit;
-	dev->open		= nr_open;
-	dev->stop		= nr_close;
-
+	dev->netdev_ops		= &nr_netdev_ops;
 	dev->header_ops		= &nr_header_ops;
 	dev->hard_header_len	= NR_NETWORK_LEN + NR_TRANSPORT_LEN;
 	dev->addr_len		= AX25_ADDR_LEN;
 	dev->type		= ARPHRD_NETROM;
-	dev->set_mac_address    = nr_set_mac_address;
 
 	/* New-style flags. */
 	dev->flags		= IFF_NOARP;