enic: Add support for fw init command on sriov vf's

This patch fixes enic_probe to do a fw init devcmd for sriov vfs.
This enables vf driver in the guest to get into adapter init state without
having to explicitly issue an init fw cmd with portprofile info. But a
successful init on the vf will require the port profile information to be
pre-provisioned by the hypervisor via the pf

(cherry picked from commit 2b68c18194b078489a84023564bcf7464b6c7b37)
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: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 922b646c7492aab3e8c335a0915741c729e92d21..99998c606d3e2f97bebca9db4692fe2d6da82b20 100644 (file)
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/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.37"
+#define DRV_VERSION            "2.1.1.38"
 #define DRV_COPYRIGHT          "Copyright 2008-2011 Cisco Systems, Inc"
 
 #define ENIC_BARS_MAX          6

diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 523149bf0a9cb8bf98369ac264abb74a904cb364..6af16df7a4d7e92dff12e74b5d0cce51c91359d7 100644 (file)
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -2461,7 +2461,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
         * called later by an upper layer.
         */
 
-       if (!enic_is_dynamic(enic) && !enic_is_sriov_vf(enic)) {
+       if (!enic_is_dynamic(enic)) {
                err = vnic_dev_init(enic->vdev, 0);
                if (err) {
                        dev_err(dev, "vNIC dev init failed, aborting\n");