diff options
| author | Xin LI <delphij@FreeBSD.org> | 2012-05-17 05:11:57 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2012-05-17 05:11:57 +0000 |
| commit | cac3dcd5f981d8843fb0acc27b4d28af1339af66 (patch) | |
| tree | 1720d207a135a239a304163c4635810a1094209a /contrib/tcpdump/ipproto.h | |
| parent | c3a9b90973c6add91710a6a213af772245017d76 (diff) | |
| parent | 60894fde29002aac35c5aff244b0f45c4d590413 (diff) | |
| download | src-cac3dcd5f981d8843fb0acc27b4d28af1339af66.tar.gz src-cac3dcd5f981d8843fb0acc27b4d28af1339af66.zip | |
Merge tcpdump 4.2.1.
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=235530
Diffstat (limited to 'contrib/tcpdump/ipproto.h')
| -rw-r--r-- | contrib/tcpdump/ipproto.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/tcpdump/ipproto.h b/contrib/tcpdump/ipproto.h index 12938b4008de..4b6bf51cfc15 100644 --- a/contrib/tcpdump/ipproto.h +++ b/contrib/tcpdump/ipproto.h @@ -134,6 +134,9 @@ extern const struct tok ipproto_values[]; #ifndef IPPROTO_VRRP #define IPPROTO_VRRP 112 #endif +#ifndef IPPROTO_CARP +#define IPPROTO_CARP 112 +#endif #ifndef IPPROTO_PGM #define IPPROTO_PGM 113 #endif |