Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f1de88d authored by Roopa Prabhu's avatar Roopa Prabhu Committed by David S. Miller
Browse files

enic: Fix address deregistration for sriov vf during port profile disassociate 



This patch fixes erroneous PF address deregistration in cases where
a port profile disassociate is called on an already disassociated interface.

Signed-off-by: default avatarRoopa Prabhu <roprabhu@cisco.com>
Signed-off-by: default avatarChristian Benvenuti <benve@cisco.com>
Signed-off-by: default avatarsujith sankar <ssujith@cisco.com>
Signed-off-by: default avatarChingWei Chang <cwchang@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ee556fe5

drivers/net/ethernet/cisco/enic/enic.h

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/ethernet/cisco/enic/enic_pp.c

+2 −2
Original line number Diff line number Diff line
@@ -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);