From owner-svn-src-all@FreeBSD.ORG Thu May 28 15:49:18 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BCA218E9; Thu, 28 May 2015 15:49:18 +0000 (UTC) (envelope-from john@baldwin.cx) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 94874AB8; Thu, 28 May 2015 15:49:17 +0000 (UTC) (envelope-from john@baldwin.cx) Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 0C7B0B962; Thu, 28 May 2015 11:49:17 -0400 (EDT) From: John Baldwin To: Eric Joyner Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r283620 - in stable/10/sys: amd64/conf conf dev/ixgbe modules modules/ix modules/ixv Date: Thu, 28 May 2015 11:49:10 -0400 Message-ID: <1987595.JGalSDZ3Rh@ralph.baldwin.cx> User-Agent: KMail/4.14.3 (FreeBSD/10.1-STABLE; KDE/4.14.3; amd64; ; ) In-Reply-To: <201505271744.t4RHiC04024525@svn.freebsd.org> References: <201505271744.t4RHiC04024525@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Thu, 28 May 2015 11:49:17 -0400 (EDT) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 28 May 2015 15:49:18 -0000 On Wednesday, May 27, 2015 05:44:12 PM Eric Joyner wrote: > Author: erj > Date: Wed May 27 17:44:11 2015 > New Revision: 283620 > URL: https://svnweb.freebsd.org/changeset/base/283620 > > Log: > MFC ixgbe commits for 10.2: > > - r280182 - Split the driver into independent pf/vf loadables > - r280197 - Resolve build issues > - r280204 - Fix multiple same-name devclasses > - r280228 - Fix i386 LINT build issues / remove unused variable > - r280252 - Fix building ixgbe with gcc > - r280962 - Make changes to busdma code similar to r257541 > - r281772 & r281773 - Remove unused variable > - partial r282280 - stats counter update (ix-only) > - r282289 - Add X550 support > - r282290 - Add X550 makefile updates > - r282293 - Add ixgbe_x550.c to conf/files > - r282299 - Fix gcc compile (extraneous extern declaration) > > Finally, add ix_txrx.c to conf/files because it's required for compile in stable/10. FYI, this has broken 'make tinderbox' for all 32-bit kernels that include ix or ixgbe: /usr/home/john/work/freebsd/stable/10/sys/dev/ixgbe/if_ix.c:2494:21: error: impl icit conversion from 'unsigned long long' to 'u_long' (aka 'unsigned long') chan ges value from 10000000000 to 1410065408 [-Werror,-Wconstant-conversion] ifp->if_baudrate = IF_Gbps(10); ~ ^~~~~~~~~~~ /usr/home/john/work/freebsd/stable/10/sys/net/if.h:187:21: note: expanded from m acro 'IF_Gbps' #define IF_Gbps(x) (IF_Mbps((x) * 1000)) /* gigabits/sec. */ ^~~~~~~~~~~~~~~~~~~ /usr/home/john/work/freebsd/stable/10/sys/net/if.h:186:21: note: expanded from m acro 'IF_Mbps' #define IF_Mbps(x) (IF_Kbps((x) * 1000)) /* megabits/sec. */ ^~~~~~~~~~~~~~~~~~~ /usr/home/john/work/freebsd/stable/10/sys/net/if.h:185:36: note: expanded from macro 'IF_Kbps' #define IF_Kbps(x) ((uintmax_t)(x) * 1000) /* kilobits/sec. */ ~~~~~~~~~~~~~~~^~~~~~ 1 error generated. *** [if_ix.o] Error code 1 On 10.x you need to use if_initbaudrate() instead of setting if_baudrate directly. -- John Baldwin