[src/trunk]: src/sys/external/bsd/ipf/netinet remove conditional code that de...

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

details:   https://anonhg.NetBSD.org/src/rev/19b807f7a17e
branches:  trunk
changeset: 365967:19b807f7a17e
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat May 07 04:38:09 2022 +0000

description:
remove conditional code that defines members of natstat_t.

kernels without INET6 support end up with a different size of
this structure than the userland does and then it errors:

# ipnat -l
70:ioctl(SIOCGNATS) object size mismatch for copying out ipfobj

with these members (which are zeroed at ipf init) enabled, the
size check works.


XXX: pullup-9 (change tested there.)

diffstat:

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

diffs (19 lines):

diff -r fbf935347774 -r 19b807f7a17e sys/external/bsd/ipf/netinet/ip_nat.h
--- a/sys/external/bsd/ipf/netinet/ip_nat.h     Sat May 07 04:35:20 2022 +0000
+++ b/sys/external/bsd/ipf/netinet/ip_nat.h     Sat May 07 04:38:09 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_nat.h,v 1.7 2015/08/07 17:31:12 prlw1 Exp $ */
+/*     $NetBSD: ip_nat.h,v 1.8 2022/05/07 04:38:09 mrg Exp $   */
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -571,9 +571,7 @@
        u_int           ns_wilds;
        u_long          ns_proto[256];
        nat_stat_side_t ns_side[2];
-#ifdef USE_INET6
        nat_stat_side_t ns_side6[2];
-#endif
 } natstat_t;
 
 typedef        struct  natlog {