Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 270987
b: refs/heads/master
c: 8c7d40f
h: refs/heads/master
i:
  270985: f3c41b9
  270983: b6d0fa2
v: v3
  • Loading branch information
Vikas Chaudhary authored and James Bottomley committed Aug 27, 2011
1 parent 0c95f5f commit 50b8005
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2a991c2159782b8d318ac9f88a36c22dda3e7185
refs/heads/master: 8c7d40fb6b51ef37df64af0e6add35baaf48896c
4 changes: 4 additions & 0 deletions trunk/drivers/scsi/scsi_transport_iscsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ 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_priority, ISCSI_NET_PARAM_VLAN_PRIORITY);
iscsi_iface_net_attr(iface, vlan_enabled, ISCSI_NET_PARAM_VLAN_ENABLED);
iscsi_iface_net_attr(iface, mtu, ISCSI_NET_PARAM_MTU);

static mode_t iscsi_iface_attr_is_visible(struct kobject *kobj,
struct attribute *attr, int i)
Expand All @@ -340,6 +341,8 @@ static mode_t iscsi_iface_attr_is_visible(struct kobject *kobj,
param = ISCSI_NET_PARAM_VLAN_PRIORITY;
else if (attr == &dev_attr_iface_vlan_enabled.attr)
param = ISCSI_NET_PARAM_VLAN_ENABLED;
else if (attr == &dev_attr_iface_mtu.attr)
param = ISCSI_NET_PARAM_MTU;
else if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4) {
if (attr == &dev_attr_ipv4_iface_ipaddress.attr)
param = ISCSI_NET_PARAM_IPV4_ADDR;
Expand Down Expand Up @@ -386,6 +389,7 @@ static struct attribute *iscsi_iface_attrs[] = {
&dev_attr_ipv6_iface_router_addr.attr,
&dev_attr_ipv6_iface_ipaddr_autocfg.attr,
&dev_attr_ipv6_iface_linklocal_autocfg.attr,
&dev_attr_iface_mtu.attr,
NULL,
};

Expand Down
1 change: 1 addition & 0 deletions trunk/include/scsi/iscsi_if.h
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ enum iscsi_net_param {
ISCSI_NET_PARAM_VLAN_ENABLED = 15,
ISCSI_NET_PARAM_IFACE_TYPE = 16,
ISCSI_NET_PARAM_IFACE_NAME = 17,
ISCSI_NET_PARAM_MTU = 18,
};

enum iscsi_conn_state {
Expand Down

0 comments on commit 50b8005

Please sign in to comment.