From owner-cvs-all Sun Oct 20 15:52:34 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28F7737B401; Sun, 20 Oct 2002 15:52:33 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE3E443E9C; Sun, 20 Oct 2002 15:52:32 -0700 (PDT) (envelope-from phk@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9KMq7mV088125; Sun, 20 Oct 2002 15:52:07 -0700 (PDT) (envelope-from phk@repoman.freebsd.org) Received: (from phk@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9KMq79h088124; Sun, 20 Oct 2002 15:52:07 -0700 (PDT) Message-Id: <200210202252.g9KMq79h088124@repoman.freebsd.org> From: Poul-Henning Kamp Date: Sun, 20 Oct 2002 15:52:07 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/netinet ip.h ip_icmp.c ip_icmp.h ip_input.c ip_output.c ip_var.h raw_ip.c tcp_subr.c X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG phk 2002/10/20 15:52:07 PDT Modified files: sys/netinet ip.h ip_icmp.c ip_icmp.h ip_input.c ip_output.c ip_var.h raw_ip.c tcp_subr.c Log: Fix two instances of variant struct definitions in sys/netinet: Remove the never completed _IP_VHL version, it has not caught on anywhere and it would make us incompatible with other BSD netstacks to retain this version. Add a CTASSERT protecting sizeof(struct ip) == 20. Don't let the size of struct ipq depend on the IPDIVERT option. This is a functional no-op commit. Approved by: re Revision Changes Path 1.20 +3 -10 src/sys/netinet/ip.h 1.73 +9 -8 src/sys/netinet/ip_icmp.c 1.19 +0 -5 src/sys/netinet/ip_icmp.h 1.215 +13 -14 src/sys/netinet/ip_input.c 1.168 +17 -39 src/sys/netinet/ip_output.c 1.67 +0 -2 src/sys/netinet/ip_var.h 1.103 +2 -3 src/sys/netinet/raw_ip.c 1.146 +4 -4 src/sys/netinet/tcp_subr.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message