From ece87141d036c4f11726d04d7925d0b77d0deac0 Mon Sep 17 00:00:00 2001 From: Yaniv Rosner Date: Wed, 1 May 2013 04:27:57 +0000 Subject: [PATCH] --- yaml --- r: 369911 b: refs/heads/master c: b0261926ef666142ff9f7de92622172bf1164a26 h: refs/heads/master i: 369909: 4b40507704669544cfa0d420c1d0774806822940 369907: 1c6ae8f2f9115f762f2f0bc545522afbe21872f1 369903: c510b4c8f8bad8c5fc06f462871fa1a5b0a6f9d3 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 23fd299a256a..ad3830c67546 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be3e45810bb1ee0bdfa93f6b9532d8c451e50f48 +refs/heads/master: b0261926ef666142ff9f7de92622172bf1164a26 diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index a024eec94be1..ad98c296b1a1 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -10667,10 +10667,12 @@ static void bnx2x_get_port_hwinfo(struct bnx2x *bp) bp->link_params.speed_cap_mask[0] = 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] = 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] = SHMEM_RD(bp, dev_info.port_feature_config[port].link_config);