svn commit: r284777 - in head: sbin/pfctl share/man/man4 sys/conf sys/net/altq sys/netpfil/pf

Ermal Luçi eri at freebsd.org
Thu Jun 25 09:00:40 UTC 2015


On Thu, Jun 25, 2015 at 10:42 AM, Bjoern A. Zeeb <bz at freebsd.org> wrote:

>
> > On 24 Jun 2015, at 19:16 , Ermal Luçi <eri at FreeBSD.org> wrote:
> >
> > Author: eri
> > Date: Wed Jun 24 19:16:41 2015
> > New Revision: 284777
> > URL: https://svnweb.freebsd.org/changeset/base/284777
> >
> > Log:
> >  ALTQ FAIRQ discipline import from DragonFLY
> >
> >  Differential Revision:  https://reviews.freebsd.org/D2847
> >  Reviewed by:    glebius, wblock(manpage)
> >  Approved by:    gnn(mentor)
> >  Obtained from:  pfSense
> >  Sponsored by:   Netgate
>
> I see a lot of kernel configurations failing to build dring a universe;
> here’s some errors:
>
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: expected declaration
> specifiers or '...' before 'pf_keyhash'
> cc1: warnings being treated as errors
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1461: error: expected declaration
> specifiers or '...' before 'pf_idhash'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1461: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1464: error: expected declaration
> specifiers or '...' before 'pf_srchash'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1464: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1469: error: expected declaration
> specifiers or '...' before 'pf_swi_cookie'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1469: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1472: error: expected declaration
> specifiers or '...' before 'pf_stateid'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1472: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1476: error: expected declaration
> specifiers or '...' before 'pf_altqs'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1476: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1478: error: expected declaration
> specifiers or '...' before 'pf_pabuf'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1478: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1481: error: expected declaration
> specifiers or '...' before 'ticket_altqs_active'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1481: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1483: error: expected declaration
> specifiers or '...' before 'ticket_altqs_inactive'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1483: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1485: error: expected declaration
> specifiers or '...' before 'altqs_inactive_open'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1485: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1487: error: expected declaration
> specifiers or '...' before 'ticket_pabuf'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1487: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1489: error: expected declaration
> specifiers or '...' before 'pf_altqs_active'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1489: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1491: error: expected declaration
> specifiers or '...' before 'pf_altqs_inactive'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1491: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1494: error: expected declaration
> specifiers or '...' before 'pf_unlinked_rules'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1494: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1508: error: expected declaration
> specifiers or '...' before 'pf_state_z'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1508: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1510: error: expected declaration
> specifiers or '...' before 'pf_state_key_z'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1510: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1512: error: expected declaration
> specifiers or '...' before 'pf_state_scrub_z'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1512: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1558: error: expected declaration
> specifiers or '...' before 'sync_ifp'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1558: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1560: error: expected declaration
> specifiers or '...' before 'pf_default_rule'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1560: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1648: error: expected declaration
> specifiers or '...' before 'pfi_all'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1648: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1675: error: expected declaration
> specifiers or '...' before 'pf_status'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1675: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1682: error: expected declaration
> specifiers or '...' before 'pf_limits'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1682: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1688: error: expected declaration
> specifiers or '...' before 'pf_anchors'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1688: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1690: error: expected declaration
> specifiers or '...' before 'pf_main_anchor'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1690: error: conflicting types
> for 'VNET_DECLARE'
> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration
> of 'VNET_DECLARE' was here
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function
> 'fairq_pfattach':
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:141: error:
> dereferencing pointer to incomplete type
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function
> 'fairq_add_altq':
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:155: error:
> dereferencing pointer to incomplete type
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:163: error:
> dereferencing pointer to incomplete type
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function
> 'fairq_request':
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:275: error:
> dereferencing pointer to incomplete type
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:280: error:
> 'ALTRQ_PURGE' undeclared (first use in this function)
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:280: error: (Each
> undeclared identifier is reported only once
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:280: error: for each
> function it appears in.)
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function
> 'fairq_purge':
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:299: error:
> dereferencing pointer to incomplete type
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function
> 'fairq_class_create':
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:387: error:
> dereferencing pointer to incomplete type
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function
> 'fairq_enqueue':
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:478: error:
> dereferencing pointer to incomplete type
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:490: error:
> dereferencing pointer to incomplete type
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function
> 'fairq_dequeue':
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:531: error:
> dereferencing pointer to incomplete type
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:546: error:
> 'ALTDQ_REMOVE' undeclared (first use in this function)
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:587: error:
> 'ALTDQ_POLL' undeclared (first use in this function)
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function
> 'fairq_addq':
> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function
> 'fairq_pollq':
> --- altq_fairq.o ---
>
>
Let me check this and fix quickly though i could not run 'make universe' i
have not seen such issues before since this a patch being used for more
than 3 years in production.

>
>> Bjoern A. Zeeb                                  Charles Haddon Spurgeon:
> "Friendship is one of the sweetest joys of life.  Many might have failed
>  beneath the bitterness of their trial  had they not found a friend."
>
>


-- 
Ermal


More information about the svn-src-all mailing list