On Thu, Apr 30, 2015 at 01:13:36PM +0100, Stuart Henderson wrote: > Diff below allows ix(4) to support 1Gb LX SFP in its SFP+ port. It is > https://github.com/torvalds/linux/commit/345be204dcbb2cc7580a63bc377a185125a6f822.patch > ported to our driver. Small changes to the 3rd hunk of the ixgbe_phy.c > patch as we don't have the "enforce_sfp" flag that Linux has.
... > @@ -1258,12 +1267,16 @@ int32_t ixgbe_get_sfp_init_sequence_offs > * SR modules > */ > if (sfp_type == ixgbe_sfp_type_da_act_lmt_core0 || > + sfp_type == ixgbe_sfp_type_1g_lx_core0 || > sfp_type == ixgbe_sfp_type_1g_cu_core0 || > - sfp_type == ixgbe_sfp_type_1g_sx_core0) > + sfp_type == ixgbe_sfp_type_1g_sx_core0 || > + sfp_type == ixgbe_sfp_type_1g_lx_core0) > sfp_type = ixgbe_sfp_type_srlr_core0; > else if (sfp_type == ixgbe_sfp_type_da_act_lmt_core1 || > + sfp_type == ixgbe_sfp_type_1g_lx_core1 || > sfp_type == ixgbe_sfp_type_1g_cu_core1 || > - sfp_type == ixgbe_sfp_type_1g_sx_core1) > + sfp_type == ixgbe_sfp_type_1g_sx_core1 || > + sfp_type == ixgbe_sfp_type_1g_lx_core1) > sfp_type = ixgbe_sfp_type_srlr_core1; No need to have ixgbe_sfp_type_1g_lx_core0 and ixgbe_sfp_type_1g_lx_core1 duplicated in the above. OK with that fixed.