enic: Bug Fix: Dont reset ENIC_SET_APPLIED flag on port profile disassociate

enic_get_vf_port returns port profile operation status only if ENIC_SET_APPLIED
flag is set. A recent rework of enic_set_port_profile added code to reset this
flag on disassociate. As a result of which a client calling enic_get_vf_port
to get the status of port profile disassociate will always get a return value
of ENODATA. This patch renames ENIC_SET_APPLIED to more appropriate
ENIC_PORT_REQUEST_APPLIED and reverts back the recent change so that the
flag is set both at associate and disassociate of a port profile.

Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David Wang <dwang2@cisco.com>
Signed-off-by: Christian Benvenuti <benve@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index a937f49d9db7..ca3be4f15556 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -32,8 +32,8 @@
 
 #define DRV_NAME                "enic"
 #define DRV_DESCRIPTION         "Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION             "1.4.1.10"
-#define DRV_COPYRIGHT           "Copyright 2008-2010 Cisco Systems, Inc"
+#define DRV_VERSION             "2.1.1.2"
+#define DRV_COPYRIGHT           "Copyright 2008-2011 Cisco Systems, Inc"
 
 #define ENIC_BARS_MAX           6
 
@@ -49,7 +49,7 @@ struct enic_msix_entry {
         void *devid;
 };
 
-#define ENIC_SET_APPLIED                (1 << 0)
+#define ENIC_PORT_REQUEST_APPLIED       (1 << 0)
 #define ENIC_SET_REQUEST                (1 << 1)
 #define ENIC_SET_NAME                   (1 << 2)
 #define ENIC_SET_INSTANCE               (1 << 3)