diff options
| author | phk <phk@FreeBSD.org> | 2002-10-20 22:52:07 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2002-10-20 22:52:07 +0000 |
| commit | 419afbc0d3d9432a72ea3e36f9c4974b31428c35 (patch) | |
| tree | 3085be4699af33492ff2fa83133fe4d6b7d15a25 /sys/netinet/ip_icmp.h | |
| parent | 58072098f10aafb040901741472830c4d8efcb3a (diff) | |
| download | FreeBSD-src-419afbc0d3d9432a72ea3e36f9c4974b31428c35.zip FreeBSD-src-419afbc0d3d9432a72ea3e36f9c4974b31428c35.tar.gz | |
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
Diffstat (limited to 'sys/netinet/ip_icmp.h')
| -rw-r--r-- | sys/netinet/ip_icmp.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h index 927efd9..609aacb 100644 --- a/sys/netinet/ip_icmp.h +++ b/sys/netinet/ip_icmp.h @@ -123,13 +123,8 @@ struct icmp { #define ICMP_TSLEN (8 + 3 * sizeof (n_time)) /* timestamp */ #define ICMP_MASKLEN 12 /* address mask */ #define ICMP_ADVLENMIN (8 + sizeof (struct ip) + 8) /* min */ -#ifndef _IP_VHL #define ICMP_ADVLEN(p) (8 + ((p)->icmp_ip.ip_hl << 2) + 8) /* N.B.: must separately check that ip_hl >= 5 */ -#else -#define ICMP_ADVLEN(p) (8 + (IP_VHL_HL((p)->icmp_ip.ip_vhl) << 2) + 8) - /* N.B.: must separately check that header length >= 5 */ -#endif /* * Definition of type and code field values. |
