--- rohc-1.4.1/src/comp/c_generic.c 2012-07-14 08:25:58.000000000 -0500 +++ rohc-1.4.1.saveit//src/comp/c_generic.c 2012-09-07 10:07:28.037122000 -0500 @@ -4600,7 +4600,7 @@ int counter) { struct c_generic_context *g_context; - unsigned int id; + unsigned short id; g_context = (struct c_generic_context *) context->specific; @@ -7337,7 +7337,7 @@ unsigned int tos; unsigned int ttl; unsigned int protocol; - unsigned int id; + unsigned short id; /* part 1 */ if(is_changed(changed_f, MOD_TOS) || header_info->tos_count < MAX_FO_COUNT)