From: Roopa Prabhu Date: Sat, 11 Feb 2012 22:12:44 +0000 (+0000) Subject: enic: remove assignment of random mac on enic vf X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=73c2ae763af0eaa1794dda68c63f97c2905722a8;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git enic: remove assignment of random mac on enic vf This patch removes random mac assignment on vf's. The vf's will start with a zero mac and with upcoming support in fw/driver, a vf mac can be set via the pf. vf's also support ndo_set_mac_address. This decision was made based on the fact that a random mac on a vf is not really needed. And this will reduce some of the problems with the vf's getting a new mac on every driver load/unload (one of them being udev renaming the device on ever load/unload and reboot). Signed-off-by: Roopa Prabhu Signed-off-by: Christian Benvenuti Signed-off-by: sujith sankar Signed-off-by: ChingWei Chang Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/cisco/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h index e65d431d4378..f7c3067d4485 100644 --- a/drivers/net/ethernet/cisco/enic/enic.h +++ b/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.34" +#define DRV_VERSION "2.1.1.35" #define DRV_COPYRIGHT "Copyright 2008-2011 Cisco Systems, Inc" #define ENIC_BARS_MAX 6 diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index 2838891a94ee..dd7e24b9ffbb 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c @@ -2463,11 +2463,6 @@ static int __devinit enic_probe(struct pci_dev *pdev, enic->port_mtu = enic->config.mtu; (void)enic_change_mtu(netdev, enic->port_mtu); -#ifdef CONFIG_PCI_IOV - if (enic_is_sriov_vf(enic) && is_zero_ether_addr(enic->mac_addr)) - random_ether_addr(enic->mac_addr); -#endif - err = enic_set_mac_addr(netdev, enic->mac_addr); if (err) { dev_err(dev, "Invalid MAC address, aborting\n");