Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / net / qlcnic / qlcnic_ctx.c

diff --git a/drivers/net/qlcnic/qlcnic_ctx.c b/drivers/net/qlcnic/qlcnic_ctx.c
index 33f5c8a..b0d32dd 100644 (file)
--- a/drivers/net/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/qlcnic/qlcnic_ctx.c
@@ -145,11 +145,7 @@ 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;
+       tmpl_hdr->drv_cap_mask = QLCNIC_DUMP_MASK_DEF;
        ahw->fw_dump.enable = 1;
 error:
        dma_free_coherent(&adapter->pdev->dev, temp_size, tmp_addr, tmp_addr_t);