* [PATCH 1/3] scsi_transport_iscsi: Declare portal type string macros for generic use @ 2013-03-25 12:08 vikas.chaudhary 2013-03-25 12:08 ` [PATCH 2/3] qla4xxx: Replace dev type macros with generic portal type macros vikas.chaudhary 2013-03-26 1:37 ` [PATCH 1/3] scsi_transport_iscsi: Declare portal type string macros for generic use Mike Christie 0 siblings, 2 replies; 5+ messages in thread From: vikas.chaudhary @ 2013-03-25 12:08 UTC (permalink / raw) To: jbottomley, michaelc Cc: linux-scsi, vikas.chaudhary, lalit.chandivade, ravi.anand, poornima.vonti, manish.rangankar, Adheer Chandravanshi From: Adheer Chandravanshi <adheer.chandravanshi@qlogic.com> Signed-off-by: Adheer Chandravanshi <adheer.chandravanshi@qlogic.com> Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com> --- include/scsi/iscsi_if.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h index f1b0183..fe7f06c 100644 --- a/include/scsi/iscsi_if.h +++ b/include/scsi/iscsi_if.h @@ -504,6 +504,10 @@ enum iscsi_host_param { ISCSI_HOST_PARAM_MAX, }; +/* portal type */ +#define PORTAL_TYPE_IPV4 "ipv4" +#define PORTAL_TYPE_IPV6 "ipv6" + /* iSCSI Flash Target params */ enum iscsi_flashnode_param { ISCSI_FLASHNODE_IS_FW_ASSIGNED_IPV6, -- 1.8.2.GIT ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] qla4xxx: Replace dev type macros with generic portal type macros 2013-03-25 12:08 [PATCH 1/3] scsi_transport_iscsi: Declare portal type string macros for generic use vikas.chaudhary @ 2013-03-25 12:08 ` vikas.chaudhary 2013-03-26 1:37 ` [PATCH 1/3] scsi_transport_iscsi: Declare portal type string macros for generic use Mike Christie 1 sibling, 0 replies; 5+ messages in thread From: vikas.chaudhary @ 2013-03-25 12:08 UTC (permalink / raw) To: jbottomley, michaelc Cc: linux-scsi, vikas.chaudhary, lalit.chandivade, ravi.anand, poornima.vonti, manish.rangankar, Adheer Chandravanshi From: Adheer Chandravanshi <adheer.chandravanshi@qlogic.com> Signed-off-by: Adheer Chandravanshi <adheer.chandravanshi@qlogic.com> Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com> --- drivers/scsi/qla4xxx/ql4_def.h | 3 --- drivers/scsi/qla4xxx/ql4_os.c | 26 ++++++++++++++------------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h index b487b0a..ddf16a8 100644 --- a/drivers/scsi/qla4xxx/ql4_def.h +++ b/drivers/scsi/qla4xxx/ql4_def.h @@ -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 diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 497ac68..95a951c 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c @@ -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; } @@ -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; @@ -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; @@ -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); @@ -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); @@ -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); @@ -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); @@ -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 @@ -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 @@ -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 -- 1.8.2.GIT ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] scsi_transport_iscsi: Declare portal type string macros for generic use 2013-03-25 12:08 [PATCH 1/3] scsi_transport_iscsi: Declare portal type string macros for generic use vikas.chaudhary 2013-03-25 12:08 ` [PATCH 2/3] qla4xxx: Replace dev type macros with generic portal type macros vikas.chaudhary @ 2013-03-26 1:37 ` Mike Christie 2013-04-11 22:17 ` James Bottomley 1 sibling, 1 reply; 5+ messages in thread From: Mike Christie @ 2013-03-26 1:37 UTC (permalink / raw) To: vikas.chaudhary Cc: jbottomley, linux-scsi, lalit.chandivade, ravi.anand, poornima.vonti, manish.rangankar, Adheer Chandravanshi Patches 1 - 3 look ok to me. Reviewed-by: Mike Christie <michaelc@cs.wisc.edu> On 03/25/2013 07:08 AM, vikas.chaudhary@qlogic.com wrote: > From: Adheer Chandravanshi <adheer.chandravanshi@qlogic.com> > > Signed-off-by: Adheer Chandravanshi <adheer.chandravanshi@qlogic.com> > Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com> > --- > include/scsi/iscsi_if.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h > index f1b0183..fe7f06c 100644 > --- a/include/scsi/iscsi_if.h > +++ b/include/scsi/iscsi_if.h > @@ -504,6 +504,10 @@ enum iscsi_host_param { > ISCSI_HOST_PARAM_MAX, > }; > > +/* portal type */ > +#define PORTAL_TYPE_IPV4 "ipv4" > +#define PORTAL_TYPE_IPV6 "ipv6" > + > /* iSCSI Flash Target params */ > enum iscsi_flashnode_param { > ISCSI_FLASHNODE_IS_FW_ASSIGNED_IPV6, > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] scsi_transport_iscsi: Declare portal type string macros for generic use 2013-03-26 1:37 ` [PATCH 1/3] scsi_transport_iscsi: Declare portal type string macros for generic use Mike Christie @ 2013-04-11 22:17 ` James Bottomley 2013-04-11 22:20 ` Mike Christie 0 siblings, 1 reply; 5+ messages in thread From: James Bottomley @ 2013-04-11 22:17 UTC (permalink / raw) To: Mike Christie Cc: vikas.chaudhary, linux-scsi, lalit.chandivade, ravi.anand, poornima.vonti, manish.rangankar, Adheer Chandravanshi On Mon, 2013-03-25 at 20:37 -0500, Mike Christie wrote: > Patches 1 - 3 look ok to me. it looks like we're missing a patch 3/3? James ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] scsi_transport_iscsi: Declare portal type string macros for generic use 2013-04-11 22:17 ` James Bottomley @ 2013-04-11 22:20 ` Mike Christie 0 siblings, 0 replies; 5+ messages in thread From: Mike Christie @ 2013-04-11 22:20 UTC (permalink / raw) To: James Bottomley Cc: vikas.chaudhary, linux-scsi, lalit.chandivade, ravi.anand, poornima.vonti, manish.rangankar, Adheer Chandravanshi [-- Attachment #1: Type: text/plain, Size: 255 bytes --] On 04/11/2013 05:17 PM, James Bottomley wrote: > On Mon, 2013-03-25 at 20:37 -0500, Mike Christie wrote: >> Patches 1 - 3 look ok to me. > > it looks like we're missing a patch 3/3? > Did only I get it. I attached the mail I got with the patch in it. [-- Attachment #2: [PATCH 3_3] qla4xxx: Update driver version to 5.03.00-k7.eml --] [-- Type: message/rfc822, Size: 2572 bytes --] From: vikas.chaudhary@qlogic.com To: jbottomley@parallels.com, michaelc@cs.wisc.edu Cc: linux-scsi@vger.kernel.org, vikas.chaudhary@qlogic.com, lalit.chandivade@qlogic.com, ravi.anand@qlogic.com, poornima.vonti@qlogic.com, manish.rangankar@qlogic.com Subject: [PATCH 3/3] qla4xxx: Update driver version to 5.03.00-k7 Date: Mon, 25 Mar 2013 08:08:33 -0400 Message-ID: <1364213313-17754-3-git-send-email-vikas.chaudhary@qlogic.com> From: Vikas Chaudhary <vikas.chaudhary@qlogic.com> Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com> --- drivers/scsi/qla4xxx/ql4_version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/qla4xxx/ql4_version.h b/drivers/scsi/qla4xxx/ql4_version.h index 0cd824f..18ad425 100644 --- a/drivers/scsi/qla4xxx/ql4_version.h +++ b/drivers/scsi/qla4xxx/ql4_version.h @@ -5,4 +5,4 @@ * See LICENSE.qla4xxx for copyright and licensing details. */ -#define QLA4XXX_DRIVER_VERSION "5.03.00-k6" +#define QLA4XXX_DRIVER_VERSION "5.03.00-k7" -- 1.8.2.GIT ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-04-11 22:20 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2013-03-25 12:08 [PATCH 1/3] scsi_transport_iscsi: Declare portal type string macros for generic use vikas.chaudhary 2013-03-25 12:08 ` [PATCH 2/3] qla4xxx: Replace dev type macros with generic portal type macros vikas.chaudhary 2013-03-26 1:37 ` [PATCH 1/3] scsi_transport_iscsi: Declare portal type string macros for generic use Mike Christie 2013-04-11 22:17 ` James Bottomley 2013-04-11 22:20 ` Mike Christie
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.