Commit c3b28ea3 authored by David S. Miller's avatar David S. Miller

Merge branch 'bnx2x'

Yuval Mintz says:

====================
This fixes 2 small bugs - one which may cause an unnecessary link flap,
and the other is a small memory leak when unloading while cnic is not
loaded.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents be3e4581 05952246
...@@ -7774,6 +7774,8 @@ void bnx2x_free_mem(struct bnx2x *bp) ...@@ -7774,6 +7774,8 @@ void bnx2x_free_mem(struct bnx2x *bp)
BNX2X_PCI_FREE(bp->eq_ring, bp->eq_mapping, BNX2X_PCI_FREE(bp->eq_ring, bp->eq_mapping,
BCM_PAGE_SIZE * NUM_EQ_PAGES); BCM_PAGE_SIZE * NUM_EQ_PAGES);
BNX2X_PCI_FREE(bp->t2, bp->t2_mapping, SRC_T2_SZ);
bnx2x_iov_free_mem(bp); bnx2x_iov_free_mem(bp);
} }
...@@ -10667,10 +10669,12 @@ static void bnx2x_get_port_hwinfo(struct bnx2x *bp) ...@@ -10667,10 +10669,12 @@ static void bnx2x_get_port_hwinfo(struct bnx2x *bp)
bp->link_params.speed_cap_mask[0] = bp->link_params.speed_cap_mask[0] =
SHMEM_RD(bp, SHMEM_RD(bp,
dev_info.port_hw_config[port].speed_capability_mask); dev_info.port_hw_config[port].speed_capability_mask) &
PORT_HW_CFG_SPEED_CAPABILITY_D0_MASK;
bp->link_params.speed_cap_mask[1] = bp->link_params.speed_cap_mask[1] =
SHMEM_RD(bp, SHMEM_RD(bp,
dev_info.port_hw_config[port].speed_capability_mask2); dev_info.port_hw_config[port].speed_capability_mask2) &
PORT_HW_CFG_SPEED_CAPABILITY_D0_MASK;
bp->port.link_config[0] = bp->port.link_config[0] =
SHMEM_RD(bp, dev_info.port_feature_config[port].link_config); SHMEM_RD(bp, dev_info.port_feature_config[port].link_config);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment