diff options
| author | sam <sam@FreeBSD.org> | 2006-09-04 19:54:21 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2006-09-04 19:54:21 +0000 |
| commit | 8bcc947abca2294c34328ac33c001fc8b000b77d (patch) | |
| tree | e0aa52f0d15c797ed6153b7446fd850742a6c1dd /contrib/libpcap/gencode.h | |
| parent | d439ca5cfb2e498bd8338759a5310dbd287201a7 (diff) | |
| download | FreeBSD-src-8bcc947abca2294c34328ac33c001fc8b000b77d.zip FreeBSD-src-8bcc947abca2294c34328ac33c001fc8b000b77d.tar.gz | |
resolve merge conflicts
MFC after: 1 month
Diffstat (limited to 'contrib/libpcap/gencode.h')
| -rw-r--r-- | contrib/libpcap/gencode.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/libpcap/gencode.h b/contrib/libpcap/gencode.h index d6dbd00..15aef6d 100644 --- a/contrib/libpcap/gencode.h +++ b/contrib/libpcap/gencode.h @@ -19,7 +19,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD$ - * @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.60.2.5 2005/06/20 21:30:17 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.60.2.6 2005/09/05 09:08:06 guy Exp $ (LBL) */ /* @@ -290,6 +290,9 @@ struct block *gen_inbound(int); struct block *gen_vlan(int); struct block *gen_mpls(int); +struct block *gen_pppoed(void); +struct block *gen_pppoes(void); + struct block *gen_atmfield_code(int atmfield, bpf_int32 jvalue, bpf_u_int32 jtype, int reverse); struct block *gen_atmtype_abbrev(int type); struct block *gen_atmmulti_abbrev(int type); |
