diff options
author | 2008-12-24 11:04:08 +0100 | |
---|---|---|
committer | 2008-12-24 11:04:08 +0100 | |
commit | 7645c4bfbb36f357f03815f5729c46ce8d89f008 (patch) | |
tree | eb2c45bbdfc715a9a6e96e6af9675a0440ef8ff1 /include/linux/netfilter | |
parent | ALSA: hda: fix incorrect mixer index values for 92hd83xx (diff) | |
parent | ALSA: hda - Add missing terminators in patch_sigmatel.c (diff) | |
download | linux-dev-7645c4bfbb36f357f03815f5729c46ce8d89f008.tar.xz linux-dev-7645c4bfbb36f357f03815f5729c46ce8d89f008.zip |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'include/linux/netfilter')
-rw-r--r-- | include/linux/netfilter/nfnetlink_conntrack.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/netfilter/nfnetlink_conntrack.h b/include/linux/netfilter/nfnetlink_conntrack.h index c19595c89304..29fe9ea1d346 100644 --- a/include/linux/netfilter/nfnetlink_conntrack.h +++ b/include/linux/netfilter/nfnetlink_conntrack.h @@ -141,6 +141,7 @@ enum ctattr_protonat { #define CTA_PROTONAT_MAX (__CTA_PROTONAT_MAX - 1) enum ctattr_natseq { + CTA_NAT_SEQ_UNSPEC, CTA_NAT_SEQ_CORRECTION_POS, CTA_NAT_SEQ_OFFSET_BEFORE, CTA_NAT_SEQ_OFFSET_AFTER, |