Merge branch 'master' into master

[tcpdump] / print-ipcomp.c

diff --git a/print-ipcomp.c b/print-ipcomp.c
index d96c30f170674fe90d58af4821a5e691351861c2..3d526d55c2aa0a10d5420a24d64a6274d636f388 100644 (file)
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -37,14 +37,14 @@ struct ipcomp {
 #include "extract.h"
 
 void
-ipcomp_print(netdissect_options *ndo, register const u_char *bp)
+ipcomp_print(netdissect_options *ndo, const u_char *bp)
 {
-       register const struct ipcomp *ipcomp;
+       const struct ipcomp *ipcomp;
        uint16_t cpi;
 
        ipcomp = (const struct ipcomp *)bp;
        ND_TCHECK(*ipcomp);
-       cpi = EXTRACT_BE_16BITS(&ipcomp->comp_cpi);
+       cpi = EXTRACT_BE_U_2(&ipcomp->comp_cpi);
 
        ND_PRINT((ndo, "IPComp(cpi=0x%04x)", cpi));