[src/netbsd-9]: src/sys/external/bsd/ipf/netinet Pull up following revision(s...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e49260456122
branches:  netbsd-9
changeset: 462781:e49260456122
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Nov 11 19:52:08 2019 +0000

description:
Pull up following revision(s) (requested by chs in ticket #418):

        sys/external/bsd/ipf/netinet/ip_fil.h: revision 1.8

revert rev 1.7 (which removed the fd_local field from frdest_t).
this structure is part of the kernel/user ABI and so we would need to
version the ioctl ABI again in order to remove this field.  but that's
a big pain so let's just leave the field there.  the problem that
was being fixed in FreeBSD related to this was a failure to locate
filter rules in certain situations, but having an unused always-zero
field there won't cause that problem.

diffstat:

 sys/external/bsd/ipf/netinet/ip_fil.h |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r 19d67a832a9c -r e49260456122 sys/external/bsd/ipf/netinet/ip_fil.h
--- a/sys/external/bsd/ipf/netinet/ip_fil.h     Mon Nov 11 19:49:11 2019 +0000
+++ b/sys/external/bsd/ipf/netinet/ip_fil.h     Mon Nov 11 19:52:08 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_fil.h,v 1.7 2019/06/26 15:26:57 christos Exp $      */
+/*     $NetBSD: ip_fil.h,v 1.7.2.1 2019/11/11 19:52:08 martin Exp $    */
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -576,6 +576,7 @@
        addrfamily_t    fd_addr;
        fr_dtypes_t     fd_type;
        int             fd_name;
+       int             fd_unused; /* part of the kernel/user ABI */
 } frdest_t;
 
 #define        fd_ip6  fd_addr.adf_addr