[SCSI] iscsi class: expand vlan support

Add support to set vlan priority and enable/disble a vlan.

Patch based on code from Vikas Chaudhary.

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

1 files changed, 11 insertions, 2 deletions

diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index 3753f7e36386..d3f256a232f8 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -281,6 +281,13 @@ struct iscsi_path {
 #define ISCSI_IFACE_TYPE_IPV4           0x01
 #define ISCSI_IFACE_TYPE_IPV6           0x02
 
+#define ISCSI_MAX_VLAN_ID               4095
+#define ISCSI_MAX_VLAN_PRIORITY         7
+
+/* iscsi vlan enable/disabled setting */
+#define ISCSI_VLAN_DISABLE      0x01
+#define ISCSI_VLAN_ENABLE       0x02
+
 /* iSCSI network params */
 enum iscsi_net_param {
         ISCSI_NET_PARAM_IPV4_ADDR               = 1,
@@ -296,8 +303,10 @@ enum iscsi_net_param {
         ISCSI_NET_PARAM_IPV6_ROUTER_AUTOCFG     = 11,
         ISCSI_NET_PARAM_IFACE_ENABLE            = 12,
         ISCSI_NET_PARAM_VLAN_ID                 = 13,
-        ISCSI_NET_PARAM_IFACE_TYPE              = 14,
-        ISCSI_NET_PARAM_IFACE_NAME              = 15,
+        ISCSI_NET_PARAM_VLAN_PRIORITY           = 14,
+        ISCSI_NET_PARAM_VLAN_ENABLED            = 15,
+        ISCSI_NET_PARAM_IFACE_TYPE              = 16,
+        ISCSI_NET_PARAM_IFACE_NAME              = 17,
 };
 
 /*