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.c | |
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.c')
-rwxr-xr-x | contrib/tcpdump/ipproto.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/tcpdump/ipproto.c b/contrib/tcpdump/ipproto.c index 644b36427719..cbb9bf3f74e6 100755 --- a/contrib/tcpdump/ipproto.c +++ b/contrib/tcpdump/ipproto.c @@ -55,6 +55,7 @@ const struct tok ipproto_values[] = { { IPPROTO_PGM, "PGM" }, { IPPROTO_SCTP, "SCTP" }, { IPPROTO_MOBILITY, "Mobility" }, + { IPPROTO_CARP, "CARP" }, { 0, NULL } }; |