pf: Fix NOINET and NOINET6 build.
ClosedPublic
Actions

Authored by des on Wed, Oct 2, 3:58 PM.

Details

Reviewers

kp
imp

Commits

rG1c82bbd8650a: pf: Fix NOINET and NOINET6 build.

Summary

Fixes: 27f54be50bb

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 59687
Build 56573: arc lint + arc unit

Event Timeline

des created this revision.Wed, Oct 2, 3:58 PM

Herald added subscribers: vegeta_tuxpowered.net, glebius, melifaro and 2 others. · View Herald TranscriptWed, Oct 2, 3:58 PM

des requested review of this revision.Wed, Oct 2, 3:58 PM

Harbormaster completed remote builds in B59687: Diff 144131.Wed, Oct 2, 3:58 PM

I can't reproduce the build failure, but this is fine.

This revision is now accepted and ready to land.Wed, Oct 2, 4:01 PM

Both LINT-NOINET and LINT-NOINET6 build for me. I wonder what's different about your env...
But it's fine.

Ah yes, you need to also not have ALTQ enabled, and in fact this patch is too simple because the module also fails to build with NOINET.

% cat sys/amd64/conf/PFNO6 ; make buildkernel KERNCONF=PFNO6 MODULES_OVERRIDE=pf -j12 >& PFNO6.log ; echo $? ; grep error: PFNO6.log
include MINIMAL
ident PFNO6
device pf
nooption INET6
2
/usr/src/main/sys/netpfil/pf/pf.c:8858:19: error: unused variable 'h6' [-Werror,-Wunused-variable]
/usr/src/main/sys/netpfil/pf/pf.c:8858:19: error: unused variable 'h6' [-Werror,-Wunused-variable]
% cat sys/amd64/conf/PFNO4 ; make buildkernel KERNCONF=PFNO4 MODULES_OVERRIDE=pf -j12 >& PFNO4.log ; echo $? ; grep error: PFNO4.log
include MINIMAL
ident PFNO4
device pf
nooption INET
2
/usr/src/main/sys/netpfil/pf/pf.c:8857:14: error: unused variable 'h' [-Werror,-Wunused-variable]

des retitled this revision from pf: Fix NOINET6 build. to pf: Fix NOINET and NOINET6 build..Wed, Oct 2, 5:39 PM

NOINET is also broken

This revision now requires review to proceed.Wed, Oct 2, 5:40 PM

Harbormaster completed remote builds in B59689: Diff 144136.Wed, Oct 2, 5:40 PM

imp accepted this revision.Wed, Oct 2, 5:42 PM

This revision is now accepted and ready to land.Wed, Oct 2, 5:42 PM

kp accepted this revision.Wed, Oct 2, 5:51 PM

Closed by commit rG1c82bbd8650a: pf: Fix NOINET and NOINET6 build. (authored by des). · Explain WhyWed, Oct 2, 5:57 PM

This revision was automatically updated to reflect the committed changes.

des added a commit: rG1c82bbd8650a: pf: Fix NOINET and NOINET6 build..