Merge branch 'master' of git://1984.lsi.us.es/nf

This commit is contained in:
David S. Miller 2012-08-31 13:06:37 -04:00
commit 0dcd5052c8
6 changed files with 25 additions and 10 deletions

View file

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