Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

[mv-sheeva.git] / drivers / net / enic / vnic_dev.c

diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c
index 11dc8f73e4bece529088d5a5c900c3917c6afb0c..fb35d8b176686b75a62856d1a1da539a6113d568 100644 (file)
--- a/drivers/net/enic/vnic_dev.c
+++ b/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)