If _IP_VHL is defined, declare a single ip_vhl member in struct ip rather

than separate ip_v and ip_hl members.  Should have no effect on current code,
but I'd eventually like to get rid of those obnoxious bitfields completely.
This commit is contained in:
Garrett Wollman 1995-12-21 21:20:27 +00:00
parent 3dbdcb2c95
commit 1814a725c2
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=12956

View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ip.h 8.2 (Berkeley) 6/1/94
* $Id: ip.h,v 1.5 1995/05/30 08:09:33 rgrimes Exp $
* $Id: ip.h,v 1.6 1995/09/21 18:01:11 wollman Exp $
*/
#ifndef _NETINET_IP_H_
@ -51,6 +51,9 @@
* against negative integers quite easily, and fail in subtle ways.
*/
struct ip {
#ifdef _IP_VHL
u_char ip_vhl; /* version << 4 | header length >> 2 */
#else
#if BYTE_ORDER == LITTLE_ENDIAN
u_char ip_hl:4, /* header length */
ip_v:4; /* version */
@ -59,6 +62,7 @@ struct ip {
u_char ip_v:4, /* version */
ip_hl:4; /* header length */
#endif
#endif /* not _IP_VHL */
u_char ip_tos; /* type of service */
short ip_len; /* total length */
u_short ip_id; /* identification */