From ff191b20d4733f89fce0bfcf15d784837d3df041 Mon Sep 17 00:00:00 2001 From: Roopa Prabhu Date: Sat, 11 Feb 2012 21:37:37 +0000 Subject: [PATCH] --- yaml --- r: 290095 b: refs/heads/master c: 9f1de88ddd5eac43c14ed20835b4c738be61e162 h: refs/heads/master i: 290093: 8d63f5a4c44f77716e94eec3d25d2996b7f5efe9 290091: 9806981e1e17591929522c5f20696844ddd8f1f5 290087: 6c751938bdf53fc9437bbe05e16a35a8d312b3c9 290079: 5d7b5753429b93cd60e640d979bd4159bd7c4832 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/cisco/enic/enic.h | 2 +- trunk/drivers/net/ethernet/cisco/enic/enic_pp.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 80ba8ecbef05..5c274b5859ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee556fe5fcc1c4f67fc854865f3108cf17714128 +refs/heads/master: 9f1de88ddd5eac43c14ed20835b4c738be61e162 diff --git a/trunk/drivers/net/ethernet/cisco/enic/enic.h b/trunk/drivers/net/ethernet/cisco/enic/enic.h index 54fd9c314b38..e65d431d4378 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.33" +#define DRV_VERSION "2.1.1.34" #define DRV_COPYRIGHT "Copyright 2008-2011 Cisco Systems, Inc" #define ENIC_BARS_MAX 6 diff --git a/trunk/drivers/net/ethernet/cisco/enic/enic_pp.c b/trunk/drivers/net/ethernet/cisco/enic/enic_pp.c index 22bf03a1829e..c758674643ce 100644 --- a/trunk/drivers/net/ethernet/cisco/enic/enic_pp.c +++ b/trunk/drivers/net/ethernet/cisco/enic/enic_pp.c @@ -207,7 +207,7 @@ static int enic_pp_disassociate(struct enic *enic, int vf, if (!is_zero_ether_addr(pp->mac_addr)) ENIC_DEVCMD_PROXY_BY_INDEX(vf, err, enic, vnic_dev_del_addr, pp->mac_addr); - else if (!is_zero_ether_addr(netdev->dev_addr)) + else if (vf == PORT_SELF_VF && !is_zero_ether_addr(netdev->dev_addr)) ENIC_DEVCMD_PROXY_BY_INDEX(vf, err, enic, vnic_dev_del_addr, netdev->dev_addr); @@ -294,7 +294,7 @@ static int enic_pp_associate(struct enic *enic, int vf, if (!is_zero_ether_addr(pp->mac_addr)) ENIC_DEVCMD_PROXY_BY_INDEX(vf, err, enic, vnic_dev_add_addr, pp->mac_addr); - else if (!is_zero_ether_addr(netdev->dev_addr)) + else if (vf == PORT_SELF_VF && !is_zero_ether_addr(netdev->dev_addr)) ENIC_DEVCMD_PROXY_BY_INDEX(vf, err, enic, vnic_dev_add_addr, netdev->dev_addr);