Date: Wed, 20 Feb 2013 09:49:14 -0800 From: Jack Vogel <jfvogel@gmail.com> To: =?ISO-8859-1?Q?Dag=2DErling_Sm=F8rgrav?= <des@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r247035 - head/sys/dev/ixgbe Message-ID: <CAFOYbckumY2SKA%2BEMmTad8usQXwRRrw5bCJ3erQFR9ZK1uNVzg@mail.gmail.com> In-Reply-To: <201302201259.r1KCxMUZ076597@svn.freebsd.org> References: <201302201259.r1KCxMUZ076597@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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=F8rgrav <des@freebsd.org>wro= te: > 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 > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 =3D=3D ixgbe_phy_sfp_intel) { > status =3D IXGBE_SUCCESS; > + } else if (hw->allow_unsupported_sfp =3D=3D 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 =3D IXGBE_SUCCESS; > } else { > - if (hw->allow_unsupported_sfp =3D=3D 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 th= e > " > - "module or the adapter. > Intel " > - "Corporation is not > responsible " > - "for any harm caused by > using " > - "untested modules.\n", > status); > - status =3D IXGBE_SUCCESS; > - } else { > - DEBUGOUT("SFP+ module not > supported\n"); > - hw->phy.type =3D > - ixgbe_phy_sfp_unsupported= ; > - status =3D > IXGBE_ERR_SFP_NOT_SUPPORTED; > - } > + DEBUGOUT("SFP+ module not supported\n"); > + hw->phy.type =3D > + ixgbe_phy_sfp_unsupported; > + status =3D IXGBE_ERR_SFP_NOT_SUPPORTED; > } > } else { > status =3D IXGBE_SUCCESS; >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFOYbckumY2SKA%2BEMmTad8usQXwRRrw5bCJ3erQFR9ZK1uNVzg>