View | Details | Raw Unified | Return to bug 150249 | Differences between
and this patch

Collapse All | Expand All

(-)ixgbe_phy.c (-9 / +6 lines)
Lines 1534-1554 Link Here
1534
				hw->phy.type = ixgbe_phy_sfp_intel;
1534
				hw->phy.type = ixgbe_phy_sfp_intel;
1535
				break;
1535
				break;
1536
			default:
1536
			default:
1537
				if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)
1537
				hw->phy.type = ixgbe_phy_sfp_unknown;
1538
					hw->phy.type =
1539
						 ixgbe_phy_sfp_passive_unknown;
1540
				else if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE)
1541
					hw->phy.type =
1542
						ixgbe_phy_sfp_active_unknown;
1543
				else
1544
					hw->phy.type = ixgbe_phy_sfp_unknown;
1545
				break;
1538
				break;
1546
			}
1539
			}
1547
		}
1540
		}
1548
1541
1549
		/* Allow any DA cable vendor */
1542
		/* Allow any DA cable vendor */
1550
		if (cable_tech & (IXGBE_SFF_DA_PASSIVE_CABLE |
1543
		if (cable_tech & (IXGBE_SFF_DA_PASSIVE_CABLE |
1551
		    IXGBE_SFF_DA_ACTIVE_CABLE)) {
1544
			IXGBE_SFF_DA_ACTIVE_CABLE)) {
1545
			if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)
1546
				hw->phy.type = ixgbe_phy_sfp_passive_unknown;
1547
			else if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE)
1548
				hw->phy.type = ixgbe_phy_sfp_active_unknown;
1552
			status = IXGBE_SUCCESS;
1549
			status = IXGBE_SUCCESS;
1553
			goto out;
1550
			goto out;
1554
		}
1551
		}

Return to bug 150249