From owner-svn-src-all@FreeBSD.ORG Wed Feb 20 17:49:22 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0EC907B8; Wed, 20 Feb 2013 17:49:22 +0000 (UTC) (envelope-from jfvogel@gmail.com) Received: from mail-vb0-f47.google.com (mail-vb0-f47.google.com [209.85.212.47]) by mx1.freebsd.org (Postfix) with ESMTP id 7BE61767; Wed, 20 Feb 2013 17:49:21 +0000 (UTC) Received: by mail-vb0-f47.google.com with SMTP id e21so5173301vbm.34 for ; Wed, 20 Feb 2013 09:49:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=gPmRART8IOsS9G8QE8+epkgcPWrNi6DBQh/97PLvelY=; b=gt1dIjPBtU7SPHvZ+vascV3dsBxvTlFiBpbNObrnSIuC6dOBpIWz5B9nkev0ZC3XLl gfoo3+K4bArs6N6zmChxkLDLJ9usQoqfHYB1XpfihLV2RzsWETJfKLAkorNJpoNqq4S1 aKbD5EBTDIcJVg2b3uJP2MyPQSVhf/aehAPoCaesLN+hWDmIA4/5pcycmwGOELmbXJ6w Lpgx0DaK1kD5PooCIVZ+LKHswV/t3YUUXwMVS7vD9KzKNidMmZQ0DRaTIFxXad2XhHFR CEdWrjQbaXJKeqTAQBYkyFrwXPkQMknS3cK4vP+82kxH/+F+g6+IUTDJD6HnmNgBP2TW yCjA== MIME-Version: 1.0 X-Received: by 10.52.30.48 with SMTP id p16mr24260827vdh.118.1361382554786; Wed, 20 Feb 2013 09:49:14 -0800 (PST) Received: by 10.220.191.132 with HTTP; Wed, 20 Feb 2013 09:49:14 -0800 (PST) In-Reply-To: <201302201259.r1KCxMUZ076597@svn.freebsd.org> References: <201302201259.r1KCxMUZ076597@svn.freebsd.org> Date: Wed, 20 Feb 2013 09:49:14 -0800 Message-ID: Subject: Re: svn commit: r247035 - head/sys/dev/ixgbe From: Jack Vogel To: =?ISO-8859-1?Q?Dag=2DErling_Sm=F8rgrav?= Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2013 17:49:22 -0000 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 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; >