]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
bnx2x: allow BCM84833 phy to advertise 100Base-T speeds
authorMintz Yuval <yuvalmin@broadcom.com>
Wed, 15 Feb 2012 02:10:30 +0000 (02:10 +0000)
committerJoe Jin <joe.jin@oracle.com>
Wed, 16 May 2012 14:47:53 +0000 (22:47 +0800)
(cherry picked from commit 10bd1f243c3a5ea1aebae88d21932e5614afa9cc)
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/bnx2x/bnx2x_main.c

index 6877d3226e4cf928bdeda6a29ae330ac19019e0f..6d70e16ddf0ddecde063162bafcfdf8c8ae0cd8b 100644 (file)
@@ -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] =