From f3b624f1e3131ba559b98194a246de8cbec634c2 Mon Sep 17 00:00:00 2001 From: Roopa Prabhu Date: Wed, 7 Mar 2012 03:50:44 +0000 Subject: [PATCH] --- yaml --- r: 291106 b: refs/heads/master c: b8622cbd58f345d48f683d881abe3037c60aa673 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/cisco/enic/enic.h | 2 +- trunk/drivers/net/ethernet/cisco/enic/enic_main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6cf5cfc49ac9..f08893a90a99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0111ad823e5e261ffc54ef728f1d852760ee4920 +refs/heads/master: b8622cbd58f345d48f683d881abe3037c60aa673 diff --git a/trunk/drivers/net/ethernet/cisco/enic/enic.h b/trunk/drivers/net/ethernet/cisco/enic/enic.h index cf1fb4b9a4ad..afe9b1662b8c 100644 --- a/trunk/drivers/net/ethernet/cisco/enic/enic.h +++ b/trunk/drivers/net/ethernet/cisco/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/trunk/drivers/net/ethernet/cisco/enic/enic_main.c b/trunk/drivers/net/ethernet/cisco/enic/enic_main.c index 9080ed651666..77b4e873f91c 100644 --- a/trunk/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/trunk/drivers/net/ethernet/cisco/enic/enic_main.c @@ -1069,7 +1069,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;