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

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

enic: Fix ndo_set_vf_mac and ndo_set_vf_port to set/get the sriov vf's mac 



This patch fixes the ndo_set_vf_mac netdev op to set the sriov vf mac
in adapter using the new fw devcmd CMD_SET_MAC_ADDR. During port profile
associate the pf driver gets the vf mac using CMD_GET_MAC_ADDR.

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 avatarDavid S. Miller <davem@davemloft.net>
parent d6c81bc6

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.36"

#define DRV_VERSION		"2.1.1.37"

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



#define ENIC_BARS_MAX		6

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

+29 −8
Original line number Diff line number Diff line
@@ -1070,8 +1070,17 @@ static int enic_set_vf_mac(struct net_device *netdev, int vf, u8 *mac) 
		return err;



	if (is_valid_ether_addr(mac)) {

		if (vf == PORT_SELF_VF) {

			memcpy(pp->vf_mac, mac, ETH_ALEN);

			return 0;

		} else {

			/*

			 * For sriov vf's set the mac in hw

			 */

			ENIC_DEVCMD_PROXY_BY_INDEX(vf, err, enic,

				vnic_dev_set_mac_addr, mac);

			return enic_dev_status_to_errno(err);

		}

	} else

		return -EINVAL;

}
@@ -1115,12 +1124,23 @@ static int enic_set_vf_port(struct net_device *netdev, int vf, 
			nla_data(port[IFLA_PORT_HOST_UUID]), PORT_UUID_MAX);

	}



	if (vf == PORT_SELF_VF) {

		/* Special case handling: mac came from IFLA_VF_MAC */

		if (!is_zero_ether_addr(prev_pp.vf_mac))

			memcpy(pp->mac_addr, prev_pp.vf_mac, ETH_ALEN);



	if (vf == PORT_SELF_VF && is_zero_ether_addr(netdev->dev_addr))

		if (is_zero_ether_addr(netdev->dev_addr))

			eth_hw_addr_random(netdev);

	} else {

		/* SR-IOV VF: get mac from adapter */

		ENIC_DEVCMD_PROXY_BY_INDEX(vf, err, enic,

			vnic_dev_get_mac_addr, pp->mac_addr);

		if (err) {

			netdev_err(netdev, "Error getting mac for vf %d\n", vf);

			memcpy(pp, &prev_pp, sizeof(*pp));

			return enic_dev_status_to_errno(err);

		}

	}



	err = enic_process_set_pp_request(enic, vf, &prev_pp, &restore_pp);

	if (err) {
@@ -1148,6 +1168,7 @@ static int enic_set_vf_port(struct net_device *netdev, int vf, 
		}

	}



	if (vf == PORT_SELF_VF)

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



	return err;