tree 99714bd068268c2b7508594211c0f78632d83d67
parent 2ef6e27d04201445756b5b0693b8435736ea9cb8
author Daniel Mentz <danielmentz@google.com> 1443228248 -0700
committer Daniel Mentz <danielmentz@google.com> 1443576854 -0700

Make nf conntrack uapi binary compatible w 4.1 kernel

Mindspeed added new values to the two enums ip_conntrack_status and enum
ctattr_type. The problem is that upstream also added new values to these
enums which now overlap with the Mindspeed ones. More specifically,
upstream added IPS_HELPER_BIT = 13 which overlaps with IPS_PERMANENT_BIT
= 13. They also added CTA_MARK_MASK, CTA_LABELS and CTA_LABELS_MASK
which overlap with CTA_COMCERTO_FP_ORIG and CTA_COMCERTO_FP_ORIG.

As a result, we would need different versions of libnetfilter_conntrack
for the old and new kernel. To avoid this, we make the binary interface
of the 3.2 and 4.1 kernel consistent.

Change-Id: I3cb61cdba35f79f536872589e4a2e7fa311e4828