From owner-svn-src-head@FreeBSD.ORG Sun Sep 28 16:21:43 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 38CA694D; Sun, 28 Sep 2014 16:21:43 +0000 (UTC) Received: from mx1.sbone.de (bird.sbone.de [46.4.1.90]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id E0C84904; Sun, 28 Sep 2014 16:21:42 +0000 (UTC) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id A183F25D37C7; Sun, 28 Sep 2014 16:21:32 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id C5B75C77074; Sun, 28 Sep 2014 16:21:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id m2TERyM86mgr; Sun, 28 Sep 2014 16:21:30 +0000 (UTC) Received: from [IPv6:fde9:577b:c1a9:4410:659f:b2ef:1a54:d54] (unknown [IPv6:fde9:577b:c1a9:4410:659f:b2ef:1a54:d54]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 0CB18C77072; Sun, 28 Sep 2014 16:21:28 +0000 (UTC) Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r272260 - head/sys/net From: "Bjoern A. Zeeb" In-Reply-To: <201409281538.s8SFcMFP003687@svn.freebsd.org> Date: Sun, 28 Sep 2014 16:21:06 +0000 Content-Transfer-Encoding: quoted-printable Message-Id: <002DAFE6-C240-48E0-ACA9-5E47C011C817@FreeBSD.org> References: <201409281538.s8SFcMFP003687@svn.freebsd.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Mailer: Apple Mail (2.1878.6) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Sep 2014 16:21:43 -0000 On 28 Sep 2014, at 15:38 , Bjoern A. Zeeb wrote: > Author: bz > Date: Sun Sep 28 15:38:21 2014 > New Revision: 272260 > URL: http://svnweb.freebsd.org/changeset/base/272260 >=20 > Log: > Remove duplicate declaraton of the if_inc_counter() function after = r272244. > if_var.h has the expected on and if_var.h include ifq.h and thus we = get > duplicates. It seems only one cavium ethernet file actually includes = ifq.h > directly which might be another cleanup to be done but need to test = first. Never mind; ifq.h is included too early in if_var.h; whoever thought = that separating these things that way was a good idea; sorry. I=92ll run a universe t make sure the next one works better. > Modified: > head/sys/net/ifq.h >=20 > Modified: head/sys/net/ifq.h > = =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/net/ifq.h Sun Sep 28 14:39:11 2014 = (r272259) > +++ head/sys/net/ifq.h Sun Sep 28 15:38:21 2014 = (r272260) > @@ -46,7 +46,6 @@ > * is splitted from if_var.h. > */ > #define IF_DUNIT_NONE -1 > -void if_inc_counter(struct ifnet *, ift_counter, int64_t inc); >=20 > #include >=20 >=20 =97=20 Bjoern A. Zeeb "Come on. Learn, goddamn it.", WarGames, 1983