From 020a47d3f3e39346357c657cd3fbcb22ac4c69ae Mon Sep 17 00:00:00 2001
From: Vasanthy Kolluri <vkolluri@cisco.com>
Date: Wed, 20 Oct 2010 10:17:09 +0000
Subject: [PATCH] --- yaml --- r: 215378 b: refs/heads/master c:
 2db77e0f331d343511d08e204be5e22f934e1a68 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/net/enic/enic_main.c |  2 +-
 trunk/drivers/net/enic/vnic_dev.c  | 10 ++++++++--
 trunk/drivers/net/enic/vnic_dev.h  |  2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a60d44953ebb..d27eb75e682e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c76fd32d0504c0450edb0e00890aa32e3ff1f73d
+refs/heads/master: 2db77e0f331d343511d08e204be5e22f934e1a68
diff --git a/trunk/drivers/net/enic/enic_main.c b/trunk/drivers/net/enic/enic_main.c
index 622106d8c055..a63d2babdd8d 100644
--- a/trunk/drivers/net/enic/enic_main.c
+++ b/trunk/drivers/net/enic/enic_main.c
@@ -1787,7 +1787,7 @@ static int enic_dev_enable(struct enic *enic)
 	int err;
 
 	spin_lock(&enic->devcmd_lock);
-	err = vnic_dev_enable(enic->vdev);
+	err = vnic_dev_enable_wait(enic->vdev);
 	spin_unlock(&enic->devcmd_lock);
 
 	return err;
diff --git a/trunk/drivers/net/enic/vnic_dev.c b/trunk/drivers/net/enic/vnic_dev.c
index 11dc8f73e4be..fb35d8b17668 100644
--- a/trunk/drivers/net/enic/vnic_dev.c
+++ b/trunk/drivers/net/enic/vnic_dev.c
@@ -487,11 +487,17 @@ int vnic_dev_close(struct vnic_dev *vdev)
 	return vnic_dev_cmd(vdev, CMD_CLOSE, &a0, &a1, wait);
 }
 
-int vnic_dev_enable(struct vnic_dev *vdev)
+int vnic_dev_enable_wait(struct vnic_dev *vdev)
 {
 	u64 a0 = 0, a1 = 0;
 	int wait = 1000;
-	return vnic_dev_cmd(vdev, CMD_ENABLE, &a0, &a1, wait);
+	int err;
+
+	err = vnic_dev_cmd(vdev, CMD_ENABLE_WAIT, &a0, &a1, wait);
+	if (err == ERR_ECMDUNKNOWN)
+		return vnic_dev_cmd(vdev, CMD_ENABLE, &a0, &a1, wait);
+
+	return err;
 }
 
 int vnic_dev_disable(struct vnic_dev *vdev)
diff --git a/trunk/drivers/net/enic/vnic_dev.h b/trunk/drivers/net/enic/vnic_dev.h
index 3f0014312080..05f9a24cd459 100644
--- a/trunk/drivers/net/enic/vnic_dev.h
+++ b/trunk/drivers/net/enic/vnic_dev.h
@@ -111,7 +111,7 @@ u32 vnic_dev_port_speed(struct vnic_dev *vdev);
 u32 vnic_dev_msg_lvl(struct vnic_dev *vdev);
 u32 vnic_dev_mtu(struct vnic_dev *vdev);
 int vnic_dev_close(struct vnic_dev *vdev);
-int vnic_dev_enable(struct vnic_dev *vdev);
+int vnic_dev_enable_wait(struct vnic_dev *vdev);
 int vnic_dev_disable(struct vnic_dev *vdev);
 int vnic_dev_open(struct vnic_dev *vdev, int arg);
 int vnic_dev_open_done(struct vnic_dev *vdev, int *done);