diff --git a/[refs] b/[refs] index 7276fe7ea365..c6462058e766 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35612a229c3a66aad7577d7f25e7ebb5286faf2d +refs/heads/master: d1beadd1cb649404bfa2c3d92f77dbcb15b712e5 diff --git a/trunk/include/uapi/linux/netfilter/xt_conntrack.h b/trunk/include/uapi/linux/netfilter/xt_conntrack.h index e3c041d54020..e5bd3083a843 100644 --- a/trunk/include/uapi/linux/netfilter/xt_conntrack.h +++ b/trunk/include/uapi/linux/netfilter/xt_conntrack.h @@ -31,6 +31,7 @@ enum { XT_CONNTRACK_REPLSRC_PORT = 1 << 10, XT_CONNTRACK_REPLDST_PORT = 1 << 11, XT_CONNTRACK_DIRECTION = 1 << 12, + XT_CONNTRACK_STATE_ALIAS = 1 << 13, }; struct xt_conntrack_mtinfo1 {