From e4b976cb0ff338e0484ff2ab441ed1564228deae Mon Sep 17 00:00:00 2001
From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Wed, 15 Apr 2009 12:52:56 +0000
Subject: [PATCH] --- yaml --- r: 149762 b: refs/heads/master c:
 a33a2bb3c9f38c79e97f6ed720412d946e894e81 h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/net/rionet.c | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index bdc82af76187..a941a5593384 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ec847f6d46f041bb2ae65efc7b00d122b03d212
+refs/heads/master: a33a2bb3c9f38c79e97f6ed720412d946e894e81
diff --git a/trunk/drivers/net/rionet.c b/trunk/drivers/net/rionet.c
index ec59e29807a6..8702e7acdee6 100644
--- a/trunk/drivers/net/rionet.c
+++ b/trunk/drivers/net/rionet.c
@@ -428,6 +428,15 @@ static const struct ethtool_ops rionet_ethtool_ops = {
 	.get_link = ethtool_op_get_link,
 };
 
+static const struct net_device_ops rionet_netdev_ops = {
+	.ndo_open		= rionet_open,
+	.ndo_stop		= rionet_close,
+	.ndo_start_xmit		= rionet_start_xmit,
+	.ndo_change_mtu		= eth_change_mtu,
+	.ndo_validate_addr	= eth_validate_addr,
+	.ndo_set_mac_address	= eth_mac_addr,
+};
+
 static int rionet_setup_netdev(struct rio_mport *mport)
 {
 	int rc = 0;
@@ -466,10 +475,7 @@ static int rionet_setup_netdev(struct rio_mport *mport)
 	ndev->dev_addr[4] = device_id >> 8;
 	ndev->dev_addr[5] = device_id & 0xff;
 
-	/* Fill in the driver function table */
-	ndev->open = &rionet_open;
-	ndev->hard_start_xmit = &rionet_start_xmit;
-	ndev->stop = &rionet_close;
+	ndev->netdev_ops = &rionet_netdev_ops;
 	ndev->mtu = RIO_MAX_MSG_SIZE - 14;
 	ndev->features = NETIF_F_LLTX;
 	SET_ETHTOOL_OPS(ndev, &rionet_ethtool_ops);