From 533b269e05f3f50d5df8ed274ec2cb6353fbb8ee Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed, 7 Jan 2009 17:56:54 -0800
Subject: [PATCH] --- yaml --- r: 127799 b: refs/heads/master c:
 d49d19c962c5f409a7dc771f185afd22cdb49edf h: refs/heads/master i:   127797:
 3a8a4f66b235f8aaa432b301930fa9f9f5bc7141   127795:
 4afa954a553f7f948bb903a83087522197f2a1bc   127791:
 50ae3849d3e72f48b1c0c9e746d54311ccb53cf7 v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/net/sb1000.c | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 86be3bfc912f..39f62f72e9c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7d1de25dc2e823c741cf1ae86a59379ca5a6804
+refs/heads/master: d49d19c962c5f409a7dc771f185afd22cdb49edf
diff --git a/trunk/drivers/net/sb1000.c b/trunk/drivers/net/sb1000.c
index be3025310e90..fc0e38bddeeb 100644
--- a/trunk/drivers/net/sb1000.c
+++ b/trunk/drivers/net/sb1000.c
@@ -134,6 +134,16 @@ static const struct pnp_device_id sb1000_pnp_ids[] = {
 };
 MODULE_DEVICE_TABLE(pnp, sb1000_pnp_ids);
 
+static const struct net_device_ops sb1000_netdev_ops = {
+	.ndo_open		= sb1000_open,
+	.ndo_start_xmit		= sb1000_start_xmit,
+	.ndo_do_ioctl		= sb1000_dev_ioctl,
+	.ndo_stop		= sb1000_close,
+	.ndo_change_mtu		= eth_change_mtu,
+	.ndo_set_mac_address 	= eth_mac_addr,
+	.ndo_validate_addr	= eth_validate_addr,
+};
+
 static int
 sb1000_probe_one(struct pnp_dev *pdev, const struct pnp_device_id *id)
 {
@@ -192,11 +202,7 @@ sb1000_probe_one(struct pnp_dev *pdev, const struct pnp_device_id *id)
 	if (sb1000_debug > 0)
 		printk(KERN_NOTICE "%s", version);
 
-	/* The SB1000-specific entries in the device structure. */
-	dev->open		= sb1000_open;
-	dev->do_ioctl		= sb1000_dev_ioctl;
-	dev->hard_start_xmit	= sb1000_start_xmit;
-	dev->stop		= sb1000_close;
+	dev->netdev_ops	= &sb1000_netdev_ops;
 
 	/* hardware address is 0:0:serial_number */
 	dev->dev_addr[2]	= serial_number >> 24 & 0xff;