diff options
| author |   David S. Miller <davem@davemloft.net> | 2012-05-08 14:40:21 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-08 14:40:21 -0400 |
| commit | 9bb862beb6e5839e92f709d33fda07678f062f20 (patch) | |
| tree | a2c396712c5a2cda380034173fd07a67bfa0489f /include/linux/netfilter | |
| parent | etherdev.h: Convert int is_<foo>_ether_addr to bool (diff) | |
| parent | netfilter: remove ip_queue support (diff) | |
Merge branch 'master' of git://1984.lsi.us.es/net-next
Diffstat (limited to 'include/linux/netfilter')
| -rw-r--r-- | include/linux/netfilter/nf_conntrack_common.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/netfilter/nf_conntrack_common.h b/include/linux/netfilter/nf_conntrack_common.h index 0d3dd66322ec..d146872a0b91 100644 --- a/include/linux/netfilter/nf_conntrack_common.h +++ b/include/linux/netfilter/nf_conntrack_common.h @@ -83,6 +83,10 @@ enum ip_conntrack_status { /* Conntrack is a fake untracked entry */ IPS_UNTRACKED_BIT = 12, IPS_UNTRACKED = (1 << IPS_UNTRACKED_BIT), + + /* Conntrack got a helper explicitly attached via CT target. */ + IPS_HELPER_BIT = 13, + IPS_HELPER = (1 << IPS_HELPER_BIT), }; /* Connection tracking event types */ |