kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'linus' into tracing/hw-branch-tracing

Browse source
This commit is contained in:
Ingo Molnar 2008-12-24 21:08:26 +01:00
commit db8862eafe
86 changed files with 468 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/linux/netfilter/nfnetlink_conntrack.h
View file

@ -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,