diff options
| author | James Bottomley | 2013-05-10 16:53:40 +0200 |
|---|---|---|
| committer | James Bottomley | 2013-05-10 16:53:40 +0200 |
| commit | 832e77bc1106592c621fc42f2f6a4500e414a0a1 (patch) | |
| tree | 2b226019e7b1344f05e44d79da956a5306d20780 /drivers/scsi/fnic/vnic_dev.c | |
| parent | Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r... (diff) | |
| parent | [SCSI] qla2xxx: Update firmware link in Kconfig file. (diff) | |
| download | kernel-qcow2-linux-832e77bc1106592c621fc42f2f6a4500e414a0a1.tar.gz kernel-qcow2-linux-832e77bc1106592c621fc42f2f6a4500e414a0a1.tar.xz kernel-qcow2-linux-832e77bc1106592c621fc42f2f6a4500e414a0a1.zip | |
Merge branch 'misc' into for-linus
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/fnic/vnic_dev.c')
| -rw-r--r-- | drivers/scsi/fnic/vnic_dev.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/scsi/fnic/vnic_dev.c b/drivers/scsi/fnic/vnic_dev.c index b576be734e2e..9795d6f3e197 100644 --- a/drivers/scsi/fnic/vnic_dev.c +++ b/drivers/scsi/fnic/vnic_dev.c @@ -584,6 +584,16 @@ int vnic_dev_init(struct vnic_dev *vdev, int arg) return vnic_dev_cmd(vdev, CMD_INIT, &a0, &a1, wait); } +u16 vnic_dev_set_default_vlan(struct vnic_dev *vdev, u16 new_default_vlan) +{ + u64 a0 = new_default_vlan, a1 = 0; + int wait = 1000; + int old_vlan = 0; + + old_vlan = vnic_dev_cmd(vdev, CMD_SET_DEFAULT_VLAN, &a0, &a1, wait); + return (u16)old_vlan; +} + int vnic_dev_link_status(struct vnic_dev *vdev) { if (vdev->linkstatus) |