[SCSI] iscsi class: fix vlan configuration

Userspace was sending the priority/id part of the vlan tag
and sysfs was displaying the id in the vlan file. This
renames the vlan sysfs file to vlan_id to reflect that it
was showing the id and to match the vlan_priority file.
This also adds a ISCSI_NET_PARAM_VLAN_TAG iscsi nl command
to relfect that we are sending down the vlan/priority
part of the tag.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index ce20dab7536..ba6a8f3ee6f 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -718,7 +718,7 @@ static void qla4xxx_set_ipv6(struct scsi_qla_host *ha,
                         qla4xxx_destroy_ipv6_iface(ha);
                 }
                 break;
-        case ISCSI_NET_PARAM_VLAN_ID:
+        case ISCSI_NET_PARAM_VLAN_TAG:
                 if (iface_param->len != sizeof(init_fw_cb->ipv6_vlan_tag))
                         break;
                 init_fw_cb->ipv6_vlan_tag =
@@ -790,7 +790,7 @@ static void qla4xxx_set_ipv4(struct scsi_qla_host *ha,
                         qla4xxx_destroy_ipv4_iface(ha);
                 }
                 break;
-        case ISCSI_NET_PARAM_VLAN_ID:
+        case ISCSI_NET_PARAM_VLAN_TAG:
                 if (iface_param->len != sizeof(init_fw_cb->ipv4_vlan_tag))
                         break;
                 init_fw_cb->ipv4_vlan_tag =