OK, this change must be backed out. This was not run past me, and this is a shared code file, that means its code that we license in both GPL, BSD, and closed source licensing, and thus we CANNOT accept changes without special handling. Further, I do not author this code, its done by another team internally, and I simply accept it as a component.
If someone feels a change needs to happen the way to handle it is to send email to me to discuss it, I need to have it reviewed internally by the full development team, and a special waiver from the author will be needed to handle the licensing. So, please uncommit this. Jack On Wed, Feb 20, 2013 at 4:59 AM, Dag-Erling Smørgrav <d...@freebsd.org>wrote: > Author: des > Date: Wed Feb 20 12:59:21 2013 > New Revision: 247035 > URL: http://svnweb.freebsd.org/changeset/base/247035 > > Log: > Reduce excessive nesting. > > Modified: > head/sys/dev/ixgbe/ixgbe_phy.c > > Modified: head/sys/dev/ixgbe/ixgbe_phy.c > > ============================================================================== > --- head/sys/dev/ixgbe/ixgbe_phy.c Wed Feb 20 12:40:26 2013 > (r247034) > +++ head/sys/dev/ixgbe/ixgbe_phy.c Wed Feb 20 12:59:21 2013 > (r247035) > @@ -1194,25 +1194,23 @@ s32 ixgbe_identify_sfp_module_generic(st > /* Make sure we're a supported PHY type */ > if (hw->phy.type == ixgbe_phy_sfp_intel) { > status = IXGBE_SUCCESS; > + } else if (hw->allow_unsupported_sfp == TRUE) { > + EWARN(hw, "WARNING: Intel (R) Network " > + "Connections are quality tested " > + "using Intel (R) Ethernet Optics." > + " Using untested modules is not " > + "supported and may cause unstable" > + " operation or damage to the " > + "module or the adapter. Intel " > + "Corporation is not responsible " > + "for any harm caused by using " > + "untested modules.\n", status); > + status = IXGBE_SUCCESS; > } else { > - if (hw->allow_unsupported_sfp == TRUE) { > - EWARN(hw, "WARNING: Intel (R) > Network " > - "Connections are quality > tested " > - "using Intel (R) Ethernet > Optics." > - " Using untested modules is > not " > - "supported and may cause > unstable" > - " operation or damage to the > " > - "module or the adapter. > Intel " > - "Corporation is not > responsible " > - "for any harm caused by > using " > - "untested modules.\n", > status); > - status = IXGBE_SUCCESS; > - } else { > - DEBUGOUT("SFP+ module not > supported\n"); > - hw->phy.type = > - ixgbe_phy_sfp_unsupported; > - status = > IXGBE_ERR_SFP_NOT_SUPPORTED; > - } > + DEBUGOUT("SFP+ module not supported\n"); > + hw->phy.type = > + ixgbe_phy_sfp_unsupported; > + status = IXGBE_ERR_SFP_NOT_SUPPORTED; > } > } else { > status = IXGBE_SUCCESS; > _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
