summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
diff options
context:
space:
mode:
authorMintz Yuval2012-02-15 03:10:30 +0100
committerDavid S. Miller2012-02-15 21:30:49 +0100
commit10bd1f243c3a5ea1aebae88d21932e5614afa9cc (patch)
tree5cac35384eb71b173ef422766d7fbd94e2a9d0b0 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
parentbnx2x: notify cnic of address of info-to-the-mcp (diff)
downloadkernel-qcow2-linux-10bd1f243c3a5ea1aebae88d21932e5614afa9cc.tar.gz
kernel-qcow2-linux-10bd1f243c3a5ea1aebae88d21932e5614afa9cc.tar.xz
kernel-qcow2-linux-10bd1f243c3a5ea1aebae88d21932e5614afa9cc.zip
bnx2x: allow BCM84833 phy to advertise 100Base-T speeds
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>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c')
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 1527aedd9786..9f2911982853 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -9298,6 +9298,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] =