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

Commit 8a375557 authored by Roopa Prabhu's avatar Roopa Prabhu Committed by David S. Miller
Browse files

enic: Decouple mac address registration and deregistration from port profile set operation 



This patch removes VM mac address registration and deregistration code during
port profile set operation. We can delay mac address registration until
enic_open.

Signed-off-by: default avatarRoopa Prabhu <roprabhu@cisco.com>
Signed-off-by: default avatarDavid Wang <dwang2@cisco.com>
Signed-off-by: default avatarChristian Benvenuti <benve@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6e30dd4e

drivers/net/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.2"

#define DRV_VERSION		"2.1.1.2a"

#define DRV_COPYRIGHT		"Copyright 2008-2011 Cisco Systems, Inc"



#define ENIC_BARS_MAX		6

drivers/net/enic/enic_main.c

+0 −6
Original line number Diff line number Diff line
@@ -1381,9 +1381,6 @@ static int enic_set_vf_port(struct net_device *netdev, int vf, 


		if (is_zero_ether_addr(netdev->dev_addr))

			random_ether_addr(netdev->dev_addr);

	} else if (new_pp.request == PORT_REQUEST_DISASSOCIATE) {

		if (!is_zero_ether_addr(enic->pp.mac_addr))

			enic_dev_del_addr(enic, enic->pp.mac_addr);

	}



	memcpy(&enic->pp, &new_pp, sizeof(struct enic_port_profile));
@@ -1392,9 +1389,6 @@ static int enic_set_vf_port(struct net_device *netdev, int vf, 
	if (err)

		goto set_port_profile_cleanup;



	if (!is_zero_ether_addr(enic->pp.mac_addr))

		enic_dev_add_addr(enic, enic->pp.mac_addr);



set_port_profile_cleanup:

	memset(enic->pp.vf_mac, 0, ETH_ALEN);