---

yaml --- r: 271610 b: refs/heads/master c: bfdb582 h: refs/heads/master v: v3
git-mirror · Oct 27, 2011 · 9c1c7ea · 9c1c7ea
1 parent 7b4b4c4
commit 9c1c7ea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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 */