From ada6df353d70226992bff9341457414714abdf2a Mon Sep 17 00:00:00 2001 From: Mike Christie Date: Thu, 6 Oct 2011 03:56:58 -0500 Subject: [PATCH] --- yaml --- r: 271139 b: refs/heads/master c: 88f4f5170fe74ae28443f304fcd226ddcf84f592 h: refs/heads/master i: 271137: c30ed495ab687c158cab650a0a69f4c7cb3fd2fe 271135: e7c3fd2651926171b152aa5de22c3b91312f967b v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_transport_iscsi.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index eb14964f9ea4..c99500ff25b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d4a690cd4f574bcb70c2cb89c227ba89a51351f +refs/heads/master: 88f4f5170fe74ae28443f304fcd226ddcf84f592 diff --git a/trunk/drivers/scsi/scsi_transport_iscsi.c b/trunk/drivers/scsi/scsi_transport_iscsi.c index d746c351588f..522423bdcb56 100644 --- a/trunk/drivers/scsi/scsi_transport_iscsi.c +++ b/trunk/drivers/scsi/scsi_transport_iscsi.c @@ -317,7 +317,7 @@ iscsi_iface_net_attr(ipv6_iface, link_local_addr, ISCSI_NET_PARAM_IPV6_LINKLOCAL iscsi_iface_net_attr(ipv6_iface, router_addr, ISCSI_NET_PARAM_IPV6_ROUTER); iscsi_iface_net_attr(ipv6_iface, ipaddr_autocfg, ISCSI_NET_PARAM_IPV6_ADDR_AUTOCFG); -iscsi_iface_net_attr(ipv6_iface, linklocal_autocfg, +iscsi_iface_net_attr(ipv6_iface, link_local_autocfg, ISCSI_NET_PARAM_IPV6_LINKLOCAL_AUTOCFG); /* common read only iface attribute */ @@ -368,7 +368,7 @@ static mode_t iscsi_iface_attr_is_visible(struct kobject *kobj, param = ISCSI_NET_PARAM_IPV6_ROUTER; else if (attr == &dev_attr_ipv6_iface_ipaddr_autocfg.attr) param = ISCSI_NET_PARAM_IPV6_ADDR_AUTOCFG; - else if (attr == &dev_attr_ipv6_iface_linklocal_autocfg.attr) + else if (attr == &dev_attr_ipv6_iface_link_local_autocfg.attr) param = ISCSI_NET_PARAM_IPV6_LINKLOCAL_AUTOCFG; else return 0; @@ -393,7 +393,7 @@ static struct attribute *iscsi_iface_attrs[] = { &dev_attr_ipv6_iface_link_local_addr.attr, &dev_attr_ipv6_iface_router_addr.attr, &dev_attr_ipv6_iface_ipaddr_autocfg.attr, - &dev_attr_ipv6_iface_linklocal_autocfg.attr, + &dev_attr_ipv6_iface_link_local_autocfg.attr, &dev_attr_iface_mtu.attr, &dev_attr_iface_port.attr, NULL,