lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

enic: Add wrapper routines for new fw devcmds for port profile handling

Browse Source 
This patch adds wrapper routines to new port profile related fw devcmds and
removes the old ones

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>
This commit is contained in:
Roopa Prabhu
2011-03-29 20:35:56 +00:00
committed by David S. Miller
parent 9085fd0985
commit 18714ff8de
2 changed files with 63 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/net/enic/enic_dev.c
View File

@@ -177,24 +177,24 @@ int enic_vnic_dev_deinit(struct enic *enic)
return err; return err;
} }
int enic_dev_init_prov(struct enic *enic, struct vic_provinfo *vp) int enic_dev_init_prov2(struct enic *enic, struct vic_provinfo *vp)
{ {
int err; int err;
spin_lock(&enic->devcmd_lock); spin_lock(&enic->devcmd_lock);
err = vnic_dev_init_prov(enic->vdev, err = vnic_dev_init_prov2(enic->vdev,
(u8 *)vp, vic_provinfo_size(vp)); (u8 *)vp, vic_provinfo_size(vp));
spin_unlock(&enic->devcmd_lock); spin_unlock(&enic->devcmd_lock);
return err; return err;
} }
int enic_dev_init_done(struct enic *enic, int *done, int *error) int enic_dev_deinit_done(struct enic *enic, int *status)
{ {
int err; int err;
spin_lock(&enic->devcmd_lock); spin_lock(&enic->devcmd_lock);
err = vnic_dev_init_done(enic->vdev, done, error); err = vnic_dev_deinit_done(enic->vdev, status);
spin_unlock(&enic->devcmd_lock); spin_unlock(&enic->devcmd_lock);
return err; return err;
@@ -219,3 +219,57 @@ void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
enic_del_vlan(enic, vid); enic_del_vlan(enic, vid);
spin_unlock(&enic->devcmd_lock); spin_unlock(&enic->devcmd_lock);
} }
int enic_dev_enable2(struct enic *enic, int active)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_enable2(enic->vdev, active);
spin_unlock(&enic->devcmd_lock);
return err;
}
int enic_dev_enable2_done(struct enic *enic, int *status)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_enable2_done(enic->vdev, status);
spin_unlock(&enic->devcmd_lock);
return err;
}
int enic_dev_status_to_errno(int devcmd_status)
{
switch (devcmd_status) {
case ERR_SUCCESS:
return 0;
case ERR_EINVAL:
return -EINVAL;
case ERR_EFAULT:
return -EFAULT;
case ERR_EPERM:
return -EPERM;
case ERR_EBUSY:
return -EBUSY;
case ERR_ECMDUNKNOWN:
case ERR_ENOTSUPPORTED:
return -EOPNOTSUPP;
case ERR_EBADSTATE:
return -EINVAL;
case ERR_ENOMEM:
return -ENOMEM;
case ERR_ETIMEDOUT:
return -ETIMEDOUT;
case ERR_ELINKDOWN:
return -ENETDOWN;
case ERR_EINPROGRESS:
return -EINPROGRESS;
case ERR_EMAXRES:
default:
return (devcmd_status < 0) ? devcmd_status : -1;
}
}

7
drivers/net/enic/enic_dev.h
View File

@@ -35,7 +35,10 @@ int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic);
int enic_dev_enable(struct enic *enic); int enic_dev_enable(struct enic *enic);
int enic_dev_disable(struct enic *enic); int enic_dev_disable(struct enic *enic);
int enic_vnic_dev_deinit(struct enic *enic); int enic_vnic_dev_deinit(struct enic *enic);
int enic_dev_init_prov(struct enic *enic, struct vic_provinfo *vp); int enic_dev_init_prov2(struct enic *enic, struct vic_provinfo *vp);
int enic_dev_init_done(struct enic *enic, int *done, int *error); int enic_dev_deinit_done(struct enic *enic, int *status);
int enic_dev_enable2(struct enic *enic, int arg);
int enic_dev_enable2_done(struct enic *enic, int *status);
int enic_dev_status_to_errno(int devcmd_status);
#endif /* _ENIC_DEV_H_ */ #endif /* _ENIC_DEV_H_ */