From 209a19b06d1ccf55a64099c9a6db5411c8d345f1 Mon Sep 17 00:00:00 2001 From: Roopa Prabhu Date: Tue, 10 Aug 2010 18:54:55 +0000 Subject: [PATCH] --- yaml --- r: 213804 b: refs/heads/master c: 294dab25e7068f9df80af53aceed332f9621c970 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/enic/enic.h | 2 +- trunk/drivers/net/enic/enic_main.c | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a72a68c04b0f..ab7527719287 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 559764d1996e6ae769feb07918687b0806f2d975 +refs/heads/master: 294dab25e7068f9df80af53aceed332f9621c970 diff --git a/trunk/drivers/net/enic/enic.h b/trunk/drivers/net/enic/enic.h index f239aa8c6f4c..75869ed7226f 100644 --- a/trunk/drivers/net/enic/enic.h +++ b/trunk/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/trunk/drivers/net/enic/enic_main.c b/trunk/drivers/net/enic/enic_main.c index 9aab85366d21..6f6c5dc36197 100644 --- a/trunk/drivers/net/enic/enic_main.c +++ b/trunk/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,