diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/enic/enic.h | 2 | ||||
-rw-r--r-- | 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 f239aa8c6f4c..75869ed7226f 100644 --- a/drivers/net/enic/enic.h +++ b/drivers/net/enic/enic.h | |||
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | #define DRV_NAME "enic" | 33 | #define DRV_NAME "enic" |
34 | #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" | 34 | #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" |
35 | #define DRV_VERSION "1.4.1.1" | 35 | #define DRV_VERSION "1.4.1.2" |
36 | #define DRV_COPYRIGHT "Copyright 2008-2010 Cisco Systems, Inc" | 36 | #define DRV_COPYRIGHT "Copyright 2008-2010 Cisco Systems, Inc" |
37 | 37 | ||
38 | #define ENIC_BARS_MAX 6 | 38 | #define ENIC_BARS_MAX 6 |
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 9aab85366d21..6f6c5dc36197 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) | |||
911 | 911 | ||
912 | static int enic_set_mac_address(struct net_device *netdev, void *p) | 912 | static int enic_set_mac_address(struct net_device *netdev, void *p) |
913 | { | 913 | { |
914 | return -EOPNOTSUPP; | 914 | struct sockaddr *saddr = p; |
915 | |||
916 | return enic_set_mac_addr(netdev, (char *)saddr->sa_data); | ||
915 | } | 917 | } |
916 | 918 | ||
917 | static int enic_dev_packet_filter(struct enic *enic, int directed, | 919 | static int enic_dev_packet_filter(struct enic *enic, int directed, |