diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2011-10-11 17:55:11 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-10-20 10:13:55 -0500 |
| commit | 2d63673b4d469cf2ddba309a916090b54e31cc35 (patch) | |
| tree | c6d4b607abcf218f5d51f3d298be0230a72dab80 /include/scsi | |
| parent | 00c31889f7513e9ffa6b2b4de8ad6d7f59a61c80 (diff) | |
| download | linux-2d63673b4d469cf2ddba309a916090b54e31cc35.tar.gz linux-2d63673b4d469cf2ddba309a916090b54e31cc35.tar.bz2 linux-2d63673b4d469cf2ddba309a916090b54e31cc35.zip | |
[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>
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/iscsi_if.h | 9 |
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 { |