Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 367403
b: refs/heads/master
c: c962c18
h: refs/heads/master
i:
  367401: e8ee0f6
  367399: 73ba597
v: v3
  • Loading branch information
Adheer Chandravanshi authored and James Bottomley committed Apr 11, 2013
1 parent 1325fa3 commit 1b1c3f5
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2902eb495d71e5cd410c9d94200d35e047404630
refs/heads/master: c962c18bb72a7d9a70586908fed431f7c29b75c3
3 changes: 0 additions & 3 deletions trunk/drivers/scsi/qla4xxx/ql4_def.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,6 @@
#define LSDW(x) ((u32)((u64)(x)))
#define MSDW(x) ((u32)((((u64)(x)) >> 16) >> 16))

#define DEV_TYPE_IPV4 "ipv4"
#define DEV_TYPE_IPV6 "ipv6"

#define DEV_DB_NON_PERSISTENT 0
#define DEV_DB_PERSISTENT 1

Expand Down
26 changes: 14 additions & 12 deletions trunk/drivers/scsi/qla4xxx/ql4_os.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2021,11 +2021,13 @@ static int qla4xxx_copy_from_fwddb_param(struct iscsi_bus_flash_session *sess,
options = le16_to_cpu(fw_ddb_entry->options);
conn->is_fw_assigned_ipv6 = test_bit(OPT_IS_FW_ASSIGNED_IPV6, &options);
if (test_bit(OPT_IPV6_DEVICE, &options)) {
rc = iscsi_switch_str_param(&sess->portal_type, DEV_TYPE_IPV6);
rc = iscsi_switch_str_param(&sess->portal_type,
PORTAL_TYPE_IPV6);
if (rc)
goto exit_copy;
} else {
rc = iscsi_switch_str_param(&sess->portal_type, DEV_TYPE_IPV4);
rc = iscsi_switch_str_param(&sess->portal_type,
PORTAL_TYPE_IPV4);
if (rc)
goto exit_copy;
}
Expand Down Expand Up @@ -2161,7 +2163,7 @@ static int qla4xxx_copy_to_fwddb_param(struct iscsi_bus_flash_session *sess,

options = le16_to_cpu(fw_ddb_entry->options);
SET_BITVAL(conn->is_fw_assigned_ipv6, options, BIT_11);
if (!strncmp(sess->portal_type, DEV_TYPE_IPV6, 4))
if (!strncmp(sess->portal_type, PORTAL_TYPE_IPV6, 4))
options |= BIT_8;
else
options &= ~BIT_8;
Expand Down Expand Up @@ -5578,8 +5580,8 @@ static int qla4xxx_sysfs_ddb_add(struct Scsi_Host *shost, const char *buf,
uint32_t options = 0;
uint32_t rval = QLA_ERROR;

if (strncasecmp(DEV_TYPE_IPV4, buf, 4) &&
strncasecmp(DEV_TYPE_IPV6, buf, 4)) {
if (strncasecmp(PORTAL_TYPE_IPV4, buf, 4) &&
strncasecmp(PORTAL_TYPE_IPV6, buf, 4)) {
DEBUG2(ql4_printk(KERN_ERR, ha, "%s: Invalid portal type\n",
__func__));
goto exit_ddb_add;
Expand Down Expand Up @@ -5663,7 +5665,7 @@ static int qla4xxx_sysfs_ddb_apply(struct iscsi_bus_flash_session *fnode_sess,
goto exit_ddb_apply;
}

if (!strncasecmp(fnode_sess->portal_type, DEV_TYPE_IPV6, 4))
if (!strncasecmp(fnode_sess->portal_type, PORTAL_TYPE_IPV6, 4))
options |= IPV6_DEFAULT_DDB_ENTRY;

rval = qla4xxx_get_default_ddb(ha, options, fw_ddb_entry_dma);
Expand Down Expand Up @@ -5858,7 +5860,7 @@ static int qla4xxx_sysfs_ddb_login(struct iscsi_bus_flash_session *fnode_sess,
goto exit_ddb_login;
}

if (!strncasecmp(fnode_sess->portal_type, DEV_TYPE_IPV6, 4))
if (!strncasecmp(fnode_sess->portal_type, PORTAL_TYPE_IPV6, 4))
options |= IPV6_DEFAULT_DDB_ENTRY;

ret = qla4xxx_get_default_ddb(ha, options, fw_ddb_entry_dma);
Expand Down Expand Up @@ -6038,7 +6040,7 @@ static int qla4xxx_sysfs_ddb_logout(struct iscsi_bus_flash_session *fnode_sess,
strncpy(flash_tddb->iscsi_name, fnode_sess->targetname,
ISCSI_NAME_SIZE);

if (!strncmp(fnode_sess->portal_type, DEV_TYPE_IPV6, 4))
if (!strncmp(fnode_sess->portal_type, PORTAL_TYPE_IPV6, 4))
sprintf(flash_tddb->ip_addr, "%pI6", fnode_conn->ipaddress);
else
sprintf(flash_tddb->ip_addr, "%pI4", fnode_conn->ipaddress);
Expand Down Expand Up @@ -6220,7 +6222,7 @@ qla4xxx_sysfs_ddb_get_param(struct iscsi_bus_flash_session *fnode_sess,
fnode_sess->default_taskmgmt_timeout);
break;
case ISCSI_FLASHNODE_IPADDR:
if (!strncmp(fnode_sess->portal_type, DEV_TYPE_IPV6, 4))
if (!strncmp(fnode_sess->portal_type, PORTAL_TYPE_IPV6, 4))
rc = sprintf(buf, "%pI6\n", fnode_conn->ipaddress);
else
rc = sprintf(buf, "%pI4\n", fnode_conn->ipaddress);
Expand All @@ -6232,7 +6234,7 @@ qla4xxx_sysfs_ddb_get_param(struct iscsi_bus_flash_session *fnode_sess,
rc = sprintf(buf, "\n");
break;
case ISCSI_FLASHNODE_REDIRECT_IPADDR:
if (!strncmp(fnode_sess->portal_type, DEV_TYPE_IPV6, 4))
if (!strncmp(fnode_sess->portal_type, PORTAL_TYPE_IPV6, 4))
rc = sprintf(buf, "%pI6\n",
fnode_conn->redirect_ipaddr);
else
Expand All @@ -6249,7 +6251,7 @@ qla4xxx_sysfs_ddb_get_param(struct iscsi_bus_flash_session *fnode_sess,
rc = sprintf(buf, "%u\n", fnode_conn->ipv4_tos);
break;
case ISCSI_FLASHNODE_IPV6_TC:
if (!strncmp(fnode_sess->portal_type, DEV_TYPE_IPV6, 4))
if (!strncmp(fnode_sess->portal_type, PORTAL_TYPE_IPV6, 4))
rc = sprintf(buf, "%u\n",
fnode_conn->ipv6_traffic_class);
else
Expand All @@ -6259,7 +6261,7 @@ qla4xxx_sysfs_ddb_get_param(struct iscsi_bus_flash_session *fnode_sess,
rc = sprintf(buf, "%u\n", fnode_conn->ipv6_flow_label);
break;
case ISCSI_FLASHNODE_LINK_LOCAL_IPV6:
if (!strncmp(fnode_sess->portal_type, DEV_TYPE_IPV6, 4))
if (!strncmp(fnode_sess->portal_type, PORTAL_TYPE_IPV6, 4))
rc = sprintf(buf, "%pI6\n",
fnode_conn->link_local_ipv6_addr);
else
Expand Down

0 comments on commit 1b1c3f5

Please sign in to comment.