From: Mintz Yuval Date: Wed, 15 Feb 2012 02:10:30 +0000 (+0000) Subject: bnx2x: allow BCM84833 phy to advertise 100Base-T speeds X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~478 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8b9afb1ae22539c5a036d2a18d06262a39054be2;p=users%2Fjedix%2Flinux-maple.git bnx2x: allow BCM84833 phy to advertise 100Base-T speeds (cherry picked from commit 10bd1f243c3a5ea1aebae88d21932e5614afa9cc) Signed-off-by: Yuval Mintz Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller Signed-off-by: Joe Jin --- diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index 6877d3226e4c..6d70e16ddf0d 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/drivers/net/bnx2x/bnx2x_main.c @@ -9228,6 +9228,11 @@ static void __devinit bnx2x_link_settings_requested(struct bnx2x *bp) SPEED_AUTO_NEG; bp->port.advertising[idx] |= bp->port.supported[idx]; + if (bp->link_params.phy[EXT_PHY1].type == + PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) + bp->port.advertising[idx] |= + (SUPPORTED_100baseT_Half | + SUPPORTED_100baseT_Full); } else { /* force 10G, no AN */ bp->link_params.req_line_speed[idx] =