svn commit: r272260 - head/sys/net

[Bjoern A. Zeeb]

On 28 Sep 2014, at 15:38 , Bjoern A. Zeeb <bz at FreeBSD.org> wrote:

> 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.


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’ll run a universe t make sure the next one works better.


> 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>
> 
> 

— 
Bjoern A. Zeeb             "Come on. Learn, goddamn it.", WarGames, 1983