[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, 5 insertions, 4 deletions

diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index 706a1bb1c59b..2703e3bedbf5 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -311,10 +311,11 @@ enum iscsi_net_param {
         ISCSI_NET_PARAM_VLAN_ID                 = 13,
         ISCSI_NET_PARAM_VLAN_PRIORITY           = 14,
         ISCSI_NET_PARAM_VLAN_ENABLED            = 15,
-        ISCSI_NET_PARAM_IFACE_TYPE              = 16,
-        ISCSI_NET_PARAM_IFACE_NAME              = 17,
-        ISCSI_NET_PARAM_MTU                     = 18,
-        ISCSI_NET_PARAM_PORT                    = 19,
+        ISCSI_NET_PARAM_VLAN_TAG                = 16,
+        ISCSI_NET_PARAM_IFACE_TYPE              = 17,
+        ISCSI_NET_PARAM_IFACE_NAME              = 18,
+        ISCSI_NET_PARAM_MTU                     = 19,
+        ISCSI_NET_PARAM_PORT                    = 20,
 };
 
 enum iscsi_conn_state {