[SCSI] bnx2i: Fixed the override of the error_mask module param
The error_mask module param overrides has a bug which prevented the new module param values to take effect. Also changed the type attribute of the error_mask1/2 module params from int to uint to allow the MSB to be set. Signed-off-by: Eddie Wai <eddie.wai@broadcom.com> Acked-by: Anil Veerabhadrappa <anilgv@broadcom.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
parent
93713f3bf1
commit
70fc872c73
|
@ -1312,14 +1312,18 @@ int bnx2i_send_fw_iscsi_init_msg(struct bnx2i_hba *hba)
|
|||
ISCSI_KCQE_COMPLETION_STATUS_PROTOCOL_ERR_EXP_DATASN) |
|
||||
/* EMC */
|
||||
(1ULL << ISCSI_KCQE_COMPLETION_STATUS_PROTOCOL_ERR_LUN));
|
||||
if (error_mask1)
|
||||
if (error_mask1) {
|
||||
iscsi_init2.error_bit_map[0] = error_mask1;
|
||||
else
|
||||
mask64 &= (u32)(~mask64);
|
||||
mask64 |= error_mask1;
|
||||
} else
|
||||
iscsi_init2.error_bit_map[0] = (u32) mask64;
|
||||
|
||||
if (error_mask2)
|
||||
if (error_mask2) {
|
||||
iscsi_init2.error_bit_map[1] = error_mask2;
|
||||
else
|
||||
mask64 &= 0xffffffff;
|
||||
mask64 |= ((u64)error_mask2 << 32);
|
||||
} else
|
||||
iscsi_init2.error_bit_map[1] = (u32) (mask64 >> 32);
|
||||
|
||||
iscsi_error_mask = mask64;
|
||||
|
|
|
@ -49,11 +49,11 @@ module_param(en_tcp_dack, int, 0664);
|
|||
MODULE_PARM_DESC(en_tcp_dack, "Enable TCP Delayed ACK");
|
||||
|
||||
unsigned int error_mask1 = 0x00;
|
||||
module_param(error_mask1, int, 0664);
|
||||
module_param(error_mask1, uint, 0664);
|
||||
MODULE_PARM_DESC(error_mask1, "Config FW iSCSI Error Mask #1");
|
||||
|
||||
unsigned int error_mask2 = 0x00;
|
||||
module_param(error_mask2, int, 0664);
|
||||
module_param(error_mask2, uint, 0664);
|
||||
MODULE_PARM_DESC(error_mask2, "Config FW iSCSI Error Mask #2");
|
||||
|
||||
unsigned int sq_size;
|
||||
|
|
Loading…
Reference in a new issue