Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40522998 authored by Anirban Chakraborty's avatar Anirban Chakraborty Committed by David S. Miller
Browse files

qlcnic: change capture mask for FW dump 



o Change FW dump capture mask to a defult value, instead of using the recommended
  value from the FW. This was done to keep the capture mask consistent with other
  function drivers.

o Update driver version to 5.0.21

Signed-off-by: default avatarAnirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: default avatarAmit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fef0c060

drivers/net/qlcnic/qlcnic.h

+3 −3
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 


#define _QLCNIC_LINUX_MAJOR 5

#define _QLCNIC_LINUX_MINOR 0

#define _QLCNIC_LINUX_SUBVERSION 20

#define QLCNIC_LINUX_VERSIONID  "5.0.20"

#define _QLCNIC_LINUX_SUBVERSION 21

#define QLCNIC_LINUX_VERSIONID  "5.0.21"

#define QLCNIC_DRV_IDC_VER  0x01

#define QLCNIC_DRIVER_VERSION  ((_QLCNIC_LINUX_MAJOR << 16) |\

		 (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))
@@ -1339,7 +1339,7 @@ enum op_codes { 
#define QLCNIC_DUMP_SKIP	BIT_7



#define QLCNIC_DUMP_MASK_MIN		3

#define QLCNIC_DUMP_MASK_DEF		0x7f

#define QLCNIC_DUMP_MASK_DEF		0x1f

#define QLCNIC_DUMP_MASK_MAX		0xff

#define QLCNIC_FORCE_FW_DUMP_KEY	0xdeadfeed

#define QLCNIC_ENABLE_FW_DUMP		0xaddfeed

drivers/net/qlcnic/qlcnic_ctx.c

+1 −5
Original line number Diff line number Diff line
@@ -145,10 +145,6 @@ int qlcnic_fw_cmd_get_minidump_temp(struct qlcnic_adapter *adapter) 
		*template++ = __le32_to_cpu(*tmp_buf++);



	tmpl_hdr = ahw->fw_dump.tmpl_hdr;

	if (tmpl_hdr->cap_mask > QLCNIC_DUMP_MASK_DEF &&

		tmpl_hdr->cap_mask <= QLCNIC_DUMP_MASK_MAX)

		tmpl_hdr->drv_cap_mask = tmpl_hdr->cap_mask;

	else

	tmpl_hdr->drv_cap_mask = QLCNIC_DUMP_MASK_DEF;

	ahw->fw_dump.enable = 1;

error: