2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index e8ed78f64007..fd20a4ff0150 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -2934,9 +2934,9 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link)
                 bnx2x_free_fp_mem_cnic(bp);
 
         if (IS_PF(bp)) {
-                bnx2x_free_mem(bp);
                 if (CNIC_LOADED(bp))
                         bnx2x_free_mem_cnic(bp);
+                bnx2x_free_mem(bp);
         }
         bp->state = BNX2X_STATE_CLOSED;
         bp->cnic_loaded = false;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index a46bc720b992..dedf68377e74 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -7786,7 +7786,7 @@ int bnx2x_alloc_mem_cnic(struct bnx2x *bp)
                                 sizeof(struct
                                        host_hc_status_block_e1x));
 
-        if (CONFIGURE_NIC_MODE(bp))
+        if (CONFIGURE_NIC_MODE(bp) && !bp->t2)
                 /* allocate searcher T2 table, as it wan't allocated before */
                 BNX2X_PCI_ALLOC(bp->t2, &bp->t2_mapping, SRC_T2_SZ);
 
@@ -7809,7 +7809,7 @@ int bnx2x_alloc_mem(struct bnx2x *bp)
 {
         int i, allocated, context_size;
 
-        if (!CONFIGURE_NIC_MODE(bp))
+        if (!CONFIGURE_NIC_MODE(bp) && !bp->t2)
                 /* allocate searcher T2 table */
                 BNX2X_PCI_ALLOC(bp->t2, &bp->t2_mapping, SRC_T2_SZ);