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_var.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_var.h')
| -rw-r--r-- | sys/netinet/ip_var.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index 43eaa03..5e821eb 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -68,10 +68,8 @@ struct ipq { u_short ipq_id; /* sequence id for reassembly */ struct mbuf *ipq_frags; /* to ip headers of fragments */ struct in_addr ipq_src,ipq_dst; -#ifdef IPDIVERT u_int32_t ipq_div_info; /* ipfw divert port & flags */ u_int16_t ipq_div_cookie; /* ipfw divert cookie */ -#endif struct label ipq_label; /* MAC label */ }; #endif /* _KERNEL */ |
