From 9c1c7ea8adc529b8f9ef8259d8d28b5523ce4ead Mon Sep 17 00:00:00 2001 From: Yaniv Rosner Date: Thu, 27 Oct 2011 05:13:52 +0000 Subject: [PATCH] --- yaml --- r: 271610 b: refs/heads/master c: bfdb58232f9227149cac89c17454edaf25f43136 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7eb36664545a..c5b21a09f3d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 001cea77b98f912050b8ea8995253fdbe7333fb6 +refs/heads/master: bfdb58232f9227149cac89c17454edaf25f43136 diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c index 1a6e37ce730c..f0ca8b27a55e 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c @@ -329,6 +329,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) PORT_HW_CFG_PHY_SELECTION_FIRST_PHY; break; case PORT_FIBRE: + case PORT_DA: if (bp->port.supported[cfg_idx] & SUPPORTED_FIBRE) break; /* no port change */