Skip to content

Commit

Permalink
enic: Replace firmware devcmd CMD_ENABLE with CMD_ENABLE_WAIT
Browse files Browse the repository at this point in the history
Replace no wait CMD_ENABLE firmware devcmd with CMD_ENABLE_WAIT

Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David Wang <dwang2@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Vasanthy Kolluri authored and David S. Miller committed Oct 21, 2010
1 parent c76fd32 commit 2db77e0
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/net/enic/enic_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 8 additions & 2 deletions drivers/net/enic/vnic_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/enic/vnic_dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 2db77e0

Please sign in to comment.