leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enic: Replace firmware devcmd CMD_ENABLE with CMD_ENABLE_WAIT

Browse Source 
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>
This commit is contained in:
Vasanthy Kolluri 2010-10-20 10:17:09 +00:00 committed by David S. Miller
parent c76fd32d05
commit 2db77e0f33
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/enic/enic_main.c
View File

@ -1787,7 +1787,7 @@ static int enic_dev_enable(struct enic *enic)
int err; int err;
spin_lock(&enic->devcmd_lock); spin_lock(&enic->devcmd_lock);
err = vnic_dev_enable(enic->vdev); err = vnic_dev_enable_wait(enic->vdev);
spin_unlock(&enic->devcmd_lock); spin_unlock(&enic->devcmd_lock);
return err; return err;

10
drivers/net/enic/vnic_dev.c
View File

@ -487,11 +487,17 @@ int vnic_dev_close(struct vnic_dev *vdev)
return vnic_dev_cmd(vdev, CMD_CLOSE, &a0, &a1, wait); 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; u64 a0 = 0, a1 = 0;
int wait = 1000; 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) int vnic_dev_disable(struct vnic_dev *vdev)

2
drivers/net/enic/vnic_dev.h
View File

@ -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_msg_lvl(struct vnic_dev *vdev);
u32 vnic_dev_mtu(struct vnic_dev *vdev); u32 vnic_dev_mtu(struct vnic_dev *vdev);
int vnic_dev_close(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_disable(struct vnic_dev *vdev);
int vnic_dev_open(struct vnic_dev *vdev, int arg); int vnic_dev_open(struct vnic_dev *vdev, int arg);
int vnic_dev_open_done(struct vnic_dev *vdev, int *done); int vnic_dev_open_done(struct vnic_dev *vdev, int *done);