git: 1e811efbc591 - main - Fix non-IPv6 build post 57785538c6e0d7e8ca0f161ab95bae10fd304047.

[Cy Schubert]

The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=1e811efbc591699b872bea42b9de419c373199df

commit 1e811efbc591699b872bea42b9de419c373199df
Author:     Cy Schubert <cy at FreeBSD.org>
AuthorDate: 2021-02-10 01:13:01 +0000
Commit:     Cy Schubert <cy at FreeBSD.org>
CommitDate: 2021-02-10 01:18:25 +0000

    Fix non-IPv6 build post 57785538c6e0d7e8ca0f161ab95bae10fd304047.
    
    57785538c6e0d7e8ca0f161ab95bae10fd304047 change the test for FreeBSD
    from __FreeBSD_version to __FreeBSD__. However this test was performed
    before sys/param.h was included, therefore __FreeBSD_version was never
    defined. As the test was never true opt_random_ip_id.h was never included.
    
    Submitted by:   bdragon
    Reported by:    bdragon
    MFC after:      1 week
    X-MFC with:     57785538c6e0d7e8ca0f161ab95bae10fd304047
---
 sys/contrib/ipfilter/netinet/ip_fil_freebsd.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
index 9f03ab3bf946..bac73cee4e8b 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
+++ b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
@@ -20,10 +20,6 @@ static const char rcsid[] = "@(#)$Id$";
     !defined(KLD_MODULE) && !defined(IPFILTER_LKM)
 # include "opt_inet6.h"
 #endif
-#if defined(__FreeBSD__) && \
-    !defined(KLD_MODULE) && !defined(IPFILTER_LKM)
-# include "opt_random_ip_id.h"
-#endif
 #include <sys/param.h>
 #include <sys/eventhandler.h>
 #include <sys/conf.h>