From owner-svn-src-all@FreeBSD.ORG  Sun Sep 28 15:38:22 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 A9361E43;
 Sun, 28 Sep 2014 15:38:22 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 95C53223;
 Sun, 28 Sep 2014 15:38:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8SFcM3D003688;
 Sun, 28 Sep 2014 15:38:22 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8SFcMFP003687;
 Sun, 28 Sep 2014 15:38:22 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201409281538.s8SFcMFP003687@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 28 Sep 2014 15:38:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r272260 - head/sys/net
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Sep 2014 15:38:22 -0000

Author: bz
Date: Sun Sep 28 15:38:21 2014
New Revision: 272260
URL: http://svnweb.freebsd.org/changeset/base/272260

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.

Modified:
  head/sys/net/ifq.h

Modified: head/sys/net/ifq.h
==============================================================================
--- 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);
 
 #include <altq/if_altq.h>