diff options
author | fenner <fenner@FreeBSD.org> | 2001-04-03 07:45:48 +0000 |
---|---|---|
committer | fenner <fenner@FreeBSD.org> | 2001-04-03 07:45:48 +0000 |
commit | f7d9a5e270bfcbb075a637a52416185441d33d8d (patch) | |
tree | e79d9e6f58638911260708c956a0d44069782cda /contrib/tcpdump/llc.h | |
parent | 04f715925eb0f85e1b7d21424cdbb3f6f1fa0b41 (diff) | |
parent | ace14a2b50f2cc05c079d0b9137b49066dbb1206 (diff) | |
download | FreeBSD-src-f7d9a5e270bfcbb075a637a52416185441d33d8d.zip FreeBSD-src-f7d9a5e270bfcbb075a637a52416185441d33d8d.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r75115,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/tcpdump/llc.h')
-rw-r--r-- | contrib/tcpdump/llc.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/contrib/tcpdump/llc.h b/contrib/tcpdump/llc.h index cd6ea20..5f0b981 100644 --- a/contrib/tcpdump/llc.h +++ b/contrib/tcpdump/llc.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /tcpdump/master/tcpdump/llc.h,v 1.6.1.1 1999/10/07 23:47:10 mcr Exp $ (LBL) + * @(#) $Header: /tcpdump/master/tcpdump/llc.h,v 1.8 2000/12/18 07:55:36 guy Exp $ (LBL) */ /* @@ -32,19 +32,19 @@ */ struct llc { - u_char dsap; - u_char ssap; + u_int8_t dsap; + u_int8_t ssap; union { - u_char u_ctl; - u_short is_ctl; + u_int8_t u_ctl; + u_int16_t is_ctl; struct { - u_char snap_ui; - u_char snap_pi[5]; + u_int8_t snap_ui; + u_int8_t snap_pi[5]; } snap; struct { - u_char snap_ui; - u_char snap_orgcode[3]; - u_char snap_ethertype[2]; + u_int8_t snap_ui; + u_int8_t snap_orgcode[3]; + u_int8_t snap_ethertype[2]; } snap_ether; } ctl; }; @@ -61,7 +61,7 @@ struct llc { #define LLC_S_FMT 1 #define LLC_U_POLL 0x10 -#define LLC_IS_POLL 0x0001 +#define LLC_IS_POLL 0x0100 #define LLC_XID_FI 0x81 #define LLC_U_CMD(u) ((u) & 0xef) @@ -74,13 +74,13 @@ struct llc { #define LLC_XID 0xaf #define LLC_FRMR 0x87 -#define LLC_S_CMD(is) (((is) >> 10) & 0x03) -#define LLC_RR 0x0100 -#define LLC_RNR 0x0500 -#define LLC_REJ 0x0900 +#define LLC_S_CMD(is) (((is) >> 1) & 0x03) +#define LLC_RR 0x0001 +#define LLC_RNR 0x0005 +#define LLC_REJ 0x0009 -#define LLC_IS_NR(is) (((is) >> 1) & 0x7f) -#define LLC_I_NS(is) (((is) >> 9) & 0x7f) +#define LLC_IS_NR(is) (((is) >> 9) & 0x7f) +#define LLC_I_NS(is) (((is) >> 1) & 0x7f) #ifndef LLCSAP_NULL #define LLCSAP_NULL 0x00 |