redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

[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>
wifi-calibration
Mike Christie 2011-10-11 17:55:11 -05:00 committed by James Bottomley
parent 00c31889f7
commit 2d63673b4d
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/qla4xxx/ql4_os.c
View File

@ -718,7 +718,7 @@ static void qla4xxx_set_ipv6(struct scsi_qla_host *ha,
qla4xxx_destroy_ipv6_iface(ha); qla4xxx_destroy_ipv6_iface(ha);
} }
break; break;
case ISCSI_NET_PARAM_VLAN_ID: case ISCSI_NET_PARAM_VLAN_TAG:
if (iface_param->len != sizeof(init_fw_cb->ipv6_vlan_tag)) if (iface_param->len != sizeof(init_fw_cb->ipv6_vlan_tag))
break; break;
init_fw_cb->ipv6_vlan_tag = 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); qla4xxx_destroy_ipv4_iface(ha);
} }
break; break;
case ISCSI_NET_PARAM_VLAN_ID: case ISCSI_NET_PARAM_VLAN_TAG:
if (iface_param->len != sizeof(init_fw_cb->ipv4_vlan_tag)) if (iface_param->len != sizeof(init_fw_cb->ipv4_vlan_tag))
break; break;
init_fw_cb->ipv4_vlan_tag = init_fw_cb->ipv4_vlan_tag =

6
drivers/scsi/scsi_transport_iscsi.c
View File

@ -322,7 +322,7 @@ iscsi_iface_net_attr(ipv6_iface, link_local_autocfg,
/* common read only iface attribute */ /* common read only iface attribute */
iscsi_iface_net_attr(iface, enabled, ISCSI_NET_PARAM_IFACE_ENABLE); iscsi_iface_net_attr(iface, enabled, ISCSI_NET_PARAM_IFACE_ENABLE);
iscsi_iface_net_attr(iface, vlan, ISCSI_NET_PARAM_VLAN_ID); iscsi_iface_net_attr(iface, vlan_id, ISCSI_NET_PARAM_VLAN_ID);
iscsi_iface_net_attr(iface, vlan_priority, ISCSI_NET_PARAM_VLAN_PRIORITY); iscsi_iface_net_attr(iface, vlan_priority, ISCSI_NET_PARAM_VLAN_PRIORITY);
iscsi_iface_net_attr(iface, vlan_enabled, ISCSI_NET_PARAM_VLAN_ENABLED); iscsi_iface_net_attr(iface, vlan_enabled, ISCSI_NET_PARAM_VLAN_ENABLED);
iscsi_iface_net_attr(iface, mtu, ISCSI_NET_PARAM_MTU); iscsi_iface_net_attr(iface, mtu, ISCSI_NET_PARAM_MTU);
@ -338,7 +338,7 @@ static mode_t iscsi_iface_attr_is_visible(struct kobject *kobj,
if (attr == &dev_attr_iface_enabled.attr) if (attr == &dev_attr_iface_enabled.attr)
param = ISCSI_NET_PARAM_IFACE_ENABLE; param = ISCSI_NET_PARAM_IFACE_ENABLE;
else if (attr == &dev_attr_iface_vlan.attr) else if (attr == &dev_attr_iface_vlan_id.attr)
param = ISCSI_NET_PARAM_VLAN_ID; param = ISCSI_NET_PARAM_VLAN_ID;
else if (attr == &dev_attr_iface_vlan_priority.attr) else if (attr == &dev_attr_iface_vlan_priority.attr)
param = ISCSI_NET_PARAM_VLAN_PRIORITY; param = ISCSI_NET_PARAM_VLAN_PRIORITY;
@ -382,7 +382,7 @@ static mode_t iscsi_iface_attr_is_visible(struct kobject *kobj,
static struct attribute *iscsi_iface_attrs[] = { static struct attribute *iscsi_iface_attrs[] = {
&dev_attr_iface_enabled.attr, &dev_attr_iface_enabled.attr,
&dev_attr_iface_vlan.attr, &dev_attr_iface_vlan_id.attr,
&dev_attr_iface_vlan_priority.attr, &dev_attr_iface_vlan_priority.attr,
&dev_attr_iface_vlan_enabled.attr, &dev_attr_iface_vlan_enabled.attr,
&dev_attr_ipv4_iface_ipaddress.attr, &dev_attr_ipv4_iface_ipaddress.attr,

9
include/scsi/iscsi_if.h
View File

@ -311,10 +311,11 @@ enum iscsi_net_param {
ISCSI_NET_PARAM_VLAN_ID = 13, ISCSI_NET_PARAM_VLAN_ID = 13,
ISCSI_NET_PARAM_VLAN_PRIORITY = 14, ISCSI_NET_PARAM_VLAN_PRIORITY = 14,
ISCSI_NET_PARAM_VLAN_ENABLED = 15, ISCSI_NET_PARAM_VLAN_ENABLED = 15,
ISCSI_NET_PARAM_IFACE_TYPE = 16, ISCSI_NET_PARAM_VLAN_TAG = 16,
ISCSI_NET_PARAM_IFACE_NAME = 17, ISCSI_NET_PARAM_IFACE_TYPE = 17,
ISCSI_NET_PARAM_MTU = 18, ISCSI_NET_PARAM_IFACE_NAME = 18,
ISCSI_NET_PARAM_PORT = 19, ISCSI_NET_PARAM_MTU = 19,
ISCSI_NET_PARAM_PORT = 20,
}; };
enum iscsi_conn_state { enum iscsi_conn_state {