gre: unbreak LINT-NOINET
ClosedPublic
Actions

Authored by ngie on Thu, Feb 26, 9:50 PM.

Details

Reviewers

imp
pouria
ae

Commits

rGafbfc2a617ee: gre: unbreak LINT-NOINET

Summary

Move some of the braces under their respective conditionals to make the statements more self-encapsulated and only define the aliasreq union in the event either INET or INET6 is defined.

Fix a copy-paste error: in_gre_ioctl should be in6_gre_ioctl in the INET6 case.

This change makes the code compile in the LINT-NOINET case (when INET6
is enabled, but INET is not).

Reported by: tinderbox
Fixes: e1e18cc12e68 ("if_gre: Add netlink support with tests")

Test Plan

make tinderbox now builds/links this code cleanly with LINT-NOINET.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 71052
Build 67935: arc lint + arc unit

Event Timeline

ngie created this revision.Thu, Feb 26, 9:50 PM

Herald added subscribers: glebius, melifaro, ae, imp. · View Herald TranscriptThu, Feb 26, 9:50 PM

ngie requested review of this revision.Thu, Feb 26, 9:50 PM

Harbormaster completed remote builds in B71038: Diff 172797.Thu, Feb 26, 9:50 PM

Incorporate more touchups to make LINT-NOINET compile/link with gre(4)

Harbormaster completed remote builds in B71052: Diff 172836.Fri, Feb 27, 4:37 AM

imp accepted this revision.Fri, Feb 27, 4:45 AM

This revision is now accepted and ready to land.Fri, Feb 27, 4:45 AM

ngie retitled this revision from if_gre: unbreak LINT-NOINET to gre: unbreak LINT-NOINET.Fri, Feb 27, 5:44 AM

ngie edited the summary of this revision. (Show Details)

ngie edited the test plan for this revision. (Show Details)

ngie added a reviewer: pouria.

ngie added a subscriber: network.

Remove the superfluous diff to build netinet/ip_gre.c when INET6 is enabled

There's no reason why this file needs to be built in the INET6 case as the INET6
implementation lives in netinet6/ip6_gre.c. Fixing the typos in
gre_clone_dump_nl(..) was all that needed to be done to make things work
(properly).

This revision now requires review to proceed.Fri, Feb 27, 5:59 AM

Harbormaster completed remote builds in B71056: Diff 172841.Fri, Feb 27, 5:59 AM

LGTM.

This revision is now accepted and ready to land.Fri, Feb 27, 10:28 AM

LGTM, thank you

Closed by commit rGafbfc2a617ee: gre: unbreak LINT-NOINET (authored by ngie). · Explain WhyFri, Feb 27, 6:43 PM

This revision was automatically updated to reflect the committed changes.

ngie added a commit: rGafbfc2a617ee: gre: unbreak LINT-NOINET.