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 <roprabhu@cisco.com>
Signed-off-by: Christian Benvenuti <benve@cisco.com>
Signed-off-by: sujith sankar <ssujith@cisco.com>
Signed-off-by: ChingWei Chang <cwchang@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cisco/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h
index e65d431d43785c41786dd2b1eeac41b168e093f0..f7c3067d44854679f94b76810b70e568cc700a9b 100644 (file)
--- 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 2838891a94ee381df47e1cd1aa43e96199bbb90f..dd7e24b9ffbb8c42f86c541454f6267be74ece1f 100644 (file)
--- 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");