Commit-ID: 294dab25e7068f9df80af53aceed332f9621c970
Gitweb: http://git.kernel.org/tip/294dab25e7068f9df80af53aceed332f9621c970
Author: Roopa Prabhu <roprabhu@xxxxxxxxx>
AuthorDate: Tue, 10 Aug 2010 18:54:55 +0000
Committer: David S. Miller <davem@xxxxxxxxxxxxx>
CommitDate: Tue, 17 Aug 2010 02:32:56 -0700
enic: Add set mac address
This patch implements the ndo_set_mac_address netdev operation for an enic device
Signed-off-by: Scott Feldman <scofeldm@xxxxxxxxx>
Signed-off-by: Roopa Prabhu <roprabhu@xxxxxxxxx>
Signed-off-by: Vasanthy Kolluri <vkolluri@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
---
drivers/net/enic/enic.h | 2 +-
drivers/net/enic/enic_main.c | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index f239aa8..75869ed 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -32,7 +32,7 @@
#define DRV_NAME "enic"
#define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION "1.4.1.1"
+#define DRV_VERSION "1.4.1.2"
#define DRV_COPYRIGHT "Copyright 2008-2010 Cisco Systems, Inc"
#define ENIC_BARS_MAX 6
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 9aab853..6f6c5dc 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -911,7 +911,9 @@ static int enic_set_mac_address_dynamic(struct net_device *netdev, void *p)
static int enic_set_mac_address(struct net_device *netdev, void *p)
{
- return -EOPNOTSUPP;
+ struct sockaddr *saddr = p;
+
+ return enic_set_mac_addr(netdev, (char *)saddr->sa_data);
}
static int enic_dev_packet_filter(struct enic *enic, int directed,
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|