diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-31 19:06:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-31 19:06:37 +0200 |
| commit | 0dcd5052c8543ef999bcd252cee50b7ae8111e89 (patch) | |
| tree | 1b10a35334ec660f8fe021ce9cdeb08bb65fc839 /include | |
| parent | bnx2x: Correct the ndo_poll_controller call (diff) | |
| parent | netfilter: nf_conntrack: fix racy timer handling with reliable events (diff) | |
| download | linux-0dcd5052c8543ef999bcd252cee50b7ae8111e89.tar.xz linux-0dcd5052c8543ef999bcd252cee50b7ae8111e89.zip | |
Merge branch 'master' of git://1984.lsi.us.es/nf
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_ecache.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/netfilter/nf_conntrack_ecache.h b/include/net/netfilter/nf_conntrack_ecache.h index e1ce1048fe5f..4a045cda9c60 100644 --- a/include/net/netfilter/nf_conntrack_ecache.h +++ b/include/net/netfilter/nf_conntrack_ecache.h @@ -18,6 +18,7 @@ struct nf_conntrack_ecache { u16 ctmask; /* bitmask of ct events to be delivered */ u16 expmask; /* bitmask of expect events to be delivered */ u32 pid; /* netlink pid of destroyer */ + struct timer_list timeout; }; static inline struct nf_conntrack_ecache * |