Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[deliverable/linux.git] / drivers / net / ethernet / cisco / enic / enic_pp.c

diff --git a/drivers/net/ethernet/cisco/enic/enic_pp.c b/drivers/net/ethernet/cisco/enic/enic_pp.c
index c347b6236f8fb90f0169e70e293fb2b8ce0ccc39..dafea1ecb7b1cf03db3f26182f6a8b199fa3c338 100644 (file)
--- a/drivers/net/ethernet/cisco/enic/enic_pp.c
+++ b/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);