[src/trunk]: src/sys CTASSERT -> __CTASSERT to unbreak userland build.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys CTASSERT -> __CTASSERT to unbreak userland build.
From: roy <roy%NetBSD.org@localhost>
Date: Mon, 08 Nov 2021 13:20:50 +0000
details:   https://anonhg.NetBSD.org/src/rev/437558870b60
branches:  trunk
changeset: 1018445:437558870b60
user:      roy <roy%NetBSD.org@localhost>
date:      Wed Feb 03 18:13:13 2021 +0000

description:
CTASSERT -> __CTASSERT to unbreak userland build.

While here move __packed in tcp_debug.h back to where it was and
note removal warrants more investigation.

diffstat:

 sys/net/if_arp.h        |   6 +++---
 sys/net/if_ether.h      |   8 ++++----
 sys/net/if_gre.h        |   6 +++---
 sys/net/if_llc.h        |   8 ++++----
 sys/netinet/igmp.h      |   6 +++---
 sys/netinet/in.h        |   6 +++---
 sys/netinet/ip.h        |  10 +++++-----
 sys/netinet/ip6.h       |   6 +++---
 sys/netinet/ip_carp.h   |   6 +++---
 sys/netinet/ip_icmp.h   |  12 ++++++------
 sys/netinet/ip_mroute.h |   6 +++---
 sys/netinet/ip_var.h    |   6 +++---
 sys/netinet/tcp.h       |   6 +++---
 sys/netinet/tcp_debug.h |   6 +++---
 sys/netinet/udp.h       |   6 +++---
 15 files changed, 52 insertions(+), 52 deletions(-)

diffs (truncated from 321 to 300 lines):

diff -r cd6c18ef2733 -r 437558870b60 sys/net/if_arp.h
--- a/sys/net/if_arp.h  Wed Feb 03 17:10:13 2021 +0000
+++ b/sys/net/if_arp.h  Wed Feb 03 18:13:13 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_arp.h,v 1.36 2021/02/03 11:53:43 roy Exp $  */
+/*     $NetBSD: if_arp.h,v 1.37 2021/02/03 18:13:13 roy Exp $  */
 
 /*
  * Copyright (c) 1986, 1993
@@ -72,8 +72,8 @@
        uint8_t  ar_tpa[];      /* target protocol address */
 #endif
 };
-#ifdef CTASSERT
-CTASSERT(sizeof(struct arphdr) == 8);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct arphdr) == 8);
 #endif
 
 static __inline uint8_t *
diff -r cd6c18ef2733 -r 437558870b60 sys/net/if_ether.h
--- a/sys/net/if_ether.h        Wed Feb 03 17:10:13 2021 +0000
+++ b/sys/net/if_ether.h        Wed Feb 03 18:13:13 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ether.h,v 1.83 2021/02/03 11:53:43 roy Exp $        */
+/*     $NetBSD: if_ether.h,v 1.84 2021/02/03 18:13:13 roy Exp $        */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -90,9 +90,9 @@
        uint16_t ether_type;
 };
 
-#ifdef CTASSERT
-CTASSERT(sizeof(struct ether_addr) == 6);
-CTASSERT(sizeof(struct ether_header) == 14);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct ether_addr) == 6);
+__CTASSERT(sizeof(struct ether_header) == 14);
 #endif
 
 #include <net/ethertypes.h>
diff -r cd6c18ef2733 -r 437558870b60 sys/net/if_gre.h
--- a/sys/net/if_gre.h  Wed Feb 03 17:10:13 2021 +0000
+++ b/sys/net/if_gre.h  Wed Feb 03 18:13:13 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_gre.h,v 1.46 2021/02/03 11:53:43 roy Exp $ */
+/*     $NetBSD: if_gre.h,v 1.47 2021/02/03 18:13:13 roy Exp $ */
 
 /*
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -131,8 +131,8 @@
                                Present if (rt_pres == 1)
  */
 };
-#ifdef CTASSERT
-CTASSERT(sizeof(struct gre_h) == 4);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct gre_h) == 4);
 #endif
 
 #define GRE_CP         0x8000  /* Checksum Present */
diff -r cd6c18ef2733 -r 437558870b60 sys/net/if_llc.h
--- a/sys/net/if_llc.h  Wed Feb 03 17:10:13 2021 +0000
+++ b/sys/net/if_llc.h  Wed Feb 03 18:13:13 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_llc.h,v 1.22 2021/02/03 12:11:34 roy Exp $  */
+/*     $NetBSD: if_llc.h,v 1.23 2021/02/03 18:13:13 roy Exp $  */
 
 /*
  * Copyright (c) 1988, 1993
@@ -92,9 +92,9 @@
        uint8_t frmr_cause;
 };
 
-#ifdef CTASSERT
-CTASSERT(sizeof(struct llc) == 8);
-CTASSERT(sizeof(struct frmrinfo) == 5);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct llc) == 8);
+__CTASSERT(sizeof(struct frmrinfo) == 5);
 #endif
 
 #define        llc_control             llc_un.type_u.control
diff -r cd6c18ef2733 -r 437558870b60 sys/netinet/igmp.h
--- a/sys/netinet/igmp.h        Wed Feb 03 17:10:13 2021 +0000
+++ b/sys/netinet/igmp.h        Wed Feb 03 18:13:13 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: igmp.h,v 1.14 2021/02/03 11:53:43 roy Exp $    */
+/*     $NetBSD: igmp.h,v 1.15 2021/02/03 18:13:13 roy Exp $    */
 
 /*
  * Copyright (c) 1992, 1993
@@ -89,8 +89,8 @@
        uint16_t        igmp_cksum;     /* IP-style checksum               */
        struct in_addr  igmp_group;     /* group address being reported    */
 };                     /*  (zero for queries)             */
-#ifdef CTASSERT
-CTASSERT(sizeof(struct igmp) == 8);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct igmp) == 8);
 #endif
 
 #define        IGMP_MINLEN                     8
diff -r cd6c18ef2733 -r 437558870b60 sys/netinet/in.h
--- a/sys/netinet/in.h  Wed Feb 03 17:10:13 2021 +0000
+++ b/sys/netinet/in.h  Wed Feb 03 18:13:13 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in.h,v 1.113 2021/02/03 11:53:43 roy Exp $     */
+/*     $NetBSD: in.h,v 1.114 2021/02/03 18:13:13 roy Exp $     */
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -158,8 +158,8 @@
 struct in_addr {
        in_addr_t s_addr;
 };
-#ifdef CTASSERT
-CTASSERT(sizeof(struct in_addr) == 4);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct in_addr) == 4);
 #endif
 
 /*
diff -r cd6c18ef2733 -r 437558870b60 sys/netinet/ip.h
--- a/sys/netinet/ip.h  Wed Feb 03 17:10:13 2021 +0000
+++ b/sys/netinet/ip.h  Wed Feb 03 18:13:13 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip.h,v 1.37 2021/02/03 11:53:43 roy Exp $      */
+/*     $NetBSD: ip.h,v 1.38 2021/02/03 18:13:13 roy Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -248,10 +248,10 @@
        u_int16_t       ippseudo_len;   /* protocol length */
 };
 
-#ifdef CTASSERT
-CTASSERT(sizeof(struct ip) == 20);
-CTASSERT(sizeof(struct ip_timestamp) == 12);
-CTASSERT(sizeof(struct ippseudo) == 12);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct ip) == 20);
+__CTASSERT(sizeof(struct ip_timestamp) == 12);
+__CTASSERT(sizeof(struct ippseudo) == 12);
 #endif
 
 #endif /* !_NETINET_IP_H_ */
diff -r cd6c18ef2733 -r 437558870b60 sys/netinet/ip6.h
--- a/sys/netinet/ip6.h Wed Feb 03 17:10:13 2021 +0000
+++ b/sys/netinet/ip6.h Wed Feb 03 18:13:13 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6.h,v 1.28 2021/02/03 11:53:43 roy Exp $     */
+/*     $NetBSD: ip6.h,v 1.29 2021/02/03 18:13:13 roy Exp $     */
 /*     $KAME: ip6.h,v 1.45 2003/06/05 04:46:38 keiichi Exp $   */
 
 /*
@@ -120,8 +120,8 @@
        u_int8_t        ip6ph_zero[3];
        u_int8_t        ip6ph_nxt;
 };
-CTASSERT(sizeof(struct ip6_hdr) == 40);
-CTASSERT(sizeof(struct ip6_hdr_pseudo) == 40);
+__CTASSERT(sizeof(struct ip6_hdr) == 40);
+__CTASSERT(sizeof(struct ip6_hdr_pseudo) == 40);
 #endif
 
 /*
diff -r cd6c18ef2733 -r 437558870b60 sys/netinet/ip_carp.h
--- a/sys/netinet/ip_carp.h     Wed Feb 03 17:10:13 2021 +0000
+++ b/sys/netinet/ip_carp.h     Wed Feb 03 18:13:13 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_carp.h,v 1.13 2021/02/03 05:51:40 roy Exp $ */
+/*     $NetBSD: ip_carp.h,v 1.14 2021/02/03 18:13:13 roy Exp $ */
 /*     $OpenBSD: ip_carp.h,v 1.18 2005/04/20 23:00:41 mpf Exp $        */
 
 /*
@@ -76,8 +76,8 @@
        unsigned char   carp_md[20];    /* SHA1 HMAC */
 };
 
-#ifdef CTASSERT
-CTASSERT(sizeof(struct carp_header) == 36);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct carp_header) == 36);
 #endif
 
 #define        CARP_DFLTTL             255
diff -r cd6c18ef2733 -r 437558870b60 sys/netinet/ip_icmp.h
--- a/sys/netinet/ip_icmp.h     Wed Feb 03 17:10:13 2021 +0000
+++ b/sys/netinet/ip_icmp.h     Wed Feb 03 18:13:13 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_icmp.h,v 1.42 2021/02/03 11:53:43 roy Exp $ */
+/*     $NetBSD: ip_icmp.h,v 1.43 2021/02/03 18:13:13 roy Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -160,11 +160,11 @@
        uint8_t c_type;
 };
 
-#ifdef CTASSERT
-CTASSERT(sizeof(struct icmp_ra_addr) == 8);
-CTASSERT(sizeof(struct icmp) == 28);
-CTASSERT(sizeof(struct icmp_ext_hdr) == 4);
-CTASSERT(sizeof(struct icmp_ext_obj_hdr) == 4);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct icmp_ra_addr) == 8);
+__CTASSERT(sizeof(struct icmp) == 28);
+__CTASSERT(sizeof(struct icmp_ext_hdr) == 4);
+__CTASSERT(sizeof(struct icmp_ext_obj_hdr) == 4);
 #endif
 
 /*
diff -r cd6c18ef2733 -r 437558870b60 sys/netinet/ip_mroute.h
--- a/sys/netinet/ip_mroute.h   Wed Feb 03 17:10:13 2021 +0000
+++ b/sys/netinet/ip_mroute.h   Wed Feb 03 18:13:13 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_mroute.h,v 1.34 2021/02/03 11:53:43 roy Exp $       */
+/*     $NetBSD: ip_mroute.h,v 1.35 2021/02/03 18:13:13 roy Exp $       */
 
 #ifndef _NETINET_IP_MROUTE_H_
 #define _NETINET_IP_MROUTE_H_
@@ -284,8 +284,8 @@
        u_int8_t  unused3;
        struct    in_addr im_src, im_dst;
 };
-#ifdef CTASSERT
-CTASSERT(sizeof(struct igmpmsg) == 20);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct igmpmsg) == 20);
 #endif
 
 /*
diff -r cd6c18ef2733 -r 437558870b60 sys/netinet/ip_var.h
--- a/sys/netinet/ip_var.h      Wed Feb 03 17:10:13 2021 +0000
+++ b/sys/netinet/ip_var.h      Wed Feb 03 18:13:13 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_var.h,v 1.132 2021/02/03 11:53:43 roy Exp $ */
+/*     $NetBSD: ip_var.h,v 1.133 2021/02/03 18:13:13 roy Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -47,8 +47,8 @@
        struct    in_addr ih_src;       /* source internet address */
        struct    in_addr ih_dst;       /* destination internet address */
 };
-#ifdef CTASSERT
-CTASSERT(sizeof(struct ipovly) == 20);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct ipovly) == 20);
 #endif
 
 /*
diff -r cd6c18ef2733 -r 437558870b60 sys/netinet/tcp.h
--- a/sys/netinet/tcp.h Wed Feb 03 17:10:13 2021 +0000
+++ b/sys/netinet/tcp.h Wed Feb 03 18:13:13 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp.h,v 1.36 2021/02/03 11:53:43 roy Exp $     */
+/*     $NetBSD: tcp.h,v 1.37 2021/02/03 18:13:13 roy Exp $     */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -73,8 +73,8 @@
        uint16_t th_sum;                        /* checksum */
        uint16_t th_urp;                        /* urgent pointer */
 };
-#ifdef CTASSERT
-CTASSERT(sizeof(struct tcphdr) == 20);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct tcphdr) == 20);
 #endif
 
 #define        TCPOPT_EOL              0
diff -r cd6c18ef2733 -r 437558870b60 sys/netinet/tcp_debug.h
--- a/sys/netinet/tcp_debug.h   Wed Feb 03 17:10:13 2021 +0000
+++ b/sys/netinet/tcp_debug.h   Wed Feb 03 18:13:13 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_debug.h,v 1.20 2021/02/03 11:52:23 roy Exp $       */
+/*     $NetBSD: tcp_debug.h,v 1.21 2021/02/03 18:13:13 roy Exp $       */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -47,7 +47,7 @@
        struct {
                struct ip ip4;
                struct tcphdr th;
-       } td_ti;
+       } __packed td_ti; /* XXX is __packed needed here? */
        struct {
 #ifdef INET6
                struct ip6_hdr ip6;
@@ -58,7 +58,7 @@
        } td_ti6;
        short   td_req;
        struct  tcpcb td_cb;
-} __packed;
+};
 
 #define        TA_INPUT        0
Prev by Date: [src/trunk]: src/sys/netinet Guard CTASSERT
Next by Date: [src/trunk]: src/sys/dev/pci Allocate enough space for the bus_dmamap_t array...
Previous by Thread: [src/trunk]: src/sys/netinet Guard CTASSERT
Next by Thread: [src/trunk]: src/sys/dev/pci Allocate enough space for the bus_dmamap_t array...
Indexes:
Home | Main Index | Thread Index | Old Index