aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index a024eec94be1..b4c9dea93a53 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -7774,6 +7774,8 @@ void bnx2x_free_mem(struct bnx2x *bp)
7774 BNX2X_PCI_FREE(bp->eq_ring, bp->eq_mapping, 7774 BNX2X_PCI_FREE(bp->eq_ring, bp->eq_mapping,
7775 BCM_PAGE_SIZE * NUM_EQ_PAGES); 7775 BCM_PAGE_SIZE * NUM_EQ_PAGES);
7776 7776
7777 BNX2X_PCI_FREE(bp->t2, bp->t2_mapping, SRC_T2_SZ);
7778
7777 bnx2x_iov_free_mem(bp); 7779 bnx2x_iov_free_mem(bp);
7778} 7780}
7779 7781
@@ -10667,10 +10669,12 @@ static void bnx2x_get_port_hwinfo(struct bnx2x *bp)
10667 10669
10668 bp->link_params.speed_cap_mask[0] = 10670 bp->link_params.speed_cap_mask[0] =
10669 SHMEM_RD(bp, 10671 SHMEM_RD(bp,
10670 dev_info.port_hw_config[port].speed_capability_mask); 10672 dev_info.port_hw_config[port].speed_capability_mask) &
10673 PORT_HW_CFG_SPEED_CAPABILITY_D0_MASK;
10671 bp->link_params.speed_cap_mask[1] = 10674 bp->link_params.speed_cap_mask[1] =
10672 SHMEM_RD(bp, 10675 SHMEM_RD(bp,
10673 dev_info.port_hw_config[port].speed_capability_mask2); 10676 dev_info.port_hw_config[port].speed_capability_mask2) &
10677 PORT_HW_CFG_SPEED_CAPABILITY_D0_MASK;
10674 bp->port.link_config[0] = 10678 bp->port.link_config[0] =
10675 SHMEM_RD(bp, dev_info.port_feature_config[port].link_config); 10679 SHMEM_RD(bp, dev_info.port_feature_config[port].link_config);
10676 10680