From: Roopa Prabhu Date: Wed, 7 Mar 2012 03:50:44 +0000 (+0000) Subject: enic: Fix addr valid check in enic_set_vf_mac X-Git-Tag: v2.6.39-400.9.0~338^2~34 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=58ac48d123da1564e3d1bd1393e9332354a66d3e;p=users%2Fjedix%2Flinux-maple.git enic: Fix addr valid check in enic_set_vf_mac zero mac address is a valid address for VIC dynamic vnic and sriov Vf's. Fix the check in enic_set_vf_mac appropriately (cherry picked from commit b8622cbd58f345d48f683d881abe3037c60aa673) Signed-off-by: Roopa Prabhu Signed-off-by: Christian Benvenuti Signed-off-by: Sujith Sankar Signed-off-by: David S. Miller Signed-off-by: Joe Jin --- diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h index cf1fb4b9a4ad..afe9b1662b8c 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 "2.1.1.38" +#define DRV_VERSION "2.1.1.39" #define DRV_COPYRIGHT "Copyright 2008-2011 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 f16ea2e6564c..57cd7923cd7e 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -1072,7 +1072,7 @@ static int enic_set_vf_mac(struct net_device *netdev, int vf, u8 *mac) if (err) return err; - if (is_valid_ether_addr(mac)) { + if (is_valid_ether_addr(mac) || is_zero_ether_addr(mac)) { if (vf == PORT_SELF_VF) { memcpy(pp->vf_mac, mac, ETH_ALEN); return 0;