diff options
author | Shahed Shaikh <shahed.shaikh@qlogic.com> | 2013-08-30 13:51:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-08-31 22:34:43 -0400 |
commit | 7010bb65ce01278abe6709fe90407183abc6cbef (patch) | |
tree | f079b9d5df5a44bbb38a922922dd0c981a687432 | |
parent | 60dcbcb02da4982351732fe2449093a11659ce31 (diff) |
qlcnic: Use firmware recommended dump capture mask as default
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h index 16df5fec0333..4e74376fdd9b 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | |||
@@ -1403,7 +1403,6 @@ struct qlcnic_esw_statistics { | |||
1403 | struct __qlcnic_esw_statistics tx; | 1403 | struct __qlcnic_esw_statistics tx; |
1404 | }; | 1404 | }; |
1405 | 1405 | ||
1406 | #define QLCNIC_DUMP_MASK_DEF 0x1f | ||
1407 | #define QLCNIC_FORCE_FW_DUMP_KEY 0xdeadfeed | 1406 | #define QLCNIC_FORCE_FW_DUMP_KEY 0xdeadfeed |
1408 | #define QLCNIC_ENABLE_FW_DUMP 0xaddfeed | 1407 | #define QLCNIC_ENABLE_FW_DUMP 0xaddfeed |
1409 | #define QLCNIC_DISABLE_FW_DUMP 0xbadfeed | 1408 | #define QLCNIC_DISABLE_FW_DUMP 0xbadfeed |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c index 79e54efe07b9..b7871fe99162 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | |||
@@ -1082,7 +1082,10 @@ flash_temp: | |||
1082 | } | 1082 | } |
1083 | 1083 | ||
1084 | tmpl_hdr = ahw->fw_dump.tmpl_hdr; | 1084 | tmpl_hdr = ahw->fw_dump.tmpl_hdr; |
1085 | tmpl_hdr->drv_cap_mask = QLCNIC_DUMP_MASK_DEF; | 1085 | tmpl_hdr->drv_cap_mask = tmpl_hdr->cap_mask; |
1086 | dev_info(&adapter->pdev->dev, | ||
1087 | "Default minidump capture mask 0x%x\n", | ||
1088 | tmpl_hdr->cap_mask); | ||
1086 | 1089 | ||
1087 | if ((tmpl_hdr->version & 0xfffff) >= 0x20001) | 1090 | if ((tmpl_hdr->version & 0xfffff) >= 0x20001) |
1088 | ahw->fw_dump.use_pex_dma = true; | 1091 | ahw->fw_dump.use_pex_dma = true; |