From 08168a2a9bfffdf5fb74bc4b5ec13ab371c0bacb Mon Sep 17 00:00:00 2001
From: "Steven J. Magnani" <steve@digidescorp.com>
Date: Wed, 17 Feb 2010 07:55:07 +0000
Subject: [PATCH] --- yaml --- r: 184281 b: refs/heads/master c:
 8ea7a37c5a312bfee51ff7f12f78efe4fbc901cc h: refs/heads/master i:   184279:
 9e927a3a1de6fc80e1e52e4b63fc8b097015c654 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/ll_temac_main.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3a76cd1039d4..4971b7248602 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3b7c12cd78d5c8264c87c29dcd9a8f1819f8313
+refs/heads/master: 8ea7a37c5a312bfee51ff7f12f78efe4fbc901cc
diff --git a/trunk/drivers/net/ll_temac_main.c b/trunk/drivers/net/ll_temac_main.c
index d7eb24cc2648..e53440253748 100644
--- a/trunk/drivers/net/ll_temac_main.c
+++ b/trunk/drivers/net/ll_temac_main.c
@@ -224,6 +224,13 @@ static int temac_set_mac_address(struct net_device *ndev, void *address)
 	return 0;
 }
 
+static int netdev_set_mac_address(struct net_device *ndev, void *p)
+{
+	struct sockaddr *addr = p;
+
+	return temac_set_mac_address(ndev, addr->sa_data);
+}
+
 static void temac_set_multicast_list(struct net_device *ndev)
 {
 	struct temac_local *lp = netdev_priv(ndev);
@@ -768,7 +775,7 @@ static const struct net_device_ops temac_netdev_ops = {
 	.ndo_open = temac_open,
 	.ndo_stop = temac_stop,
 	.ndo_start_xmit = temac_start_xmit,
-	.ndo_set_mac_address = temac_set_mac_address,
+	.ndo_set_mac_address = netdev_set_mac_address,
 	//.ndo_set_multicast_list = temac_set_multicast_list,
 #ifdef CONFIG_NET_POLL_CONTROLLER
 	.ndo_poll_controller = temac_poll_controller,