leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Browse Source 
This merges (3f509c6 netfilter: nf_nat_sip: fix incorrect handling
of EBUSY for RTCP expectation) to Patrick McHardy's IPv6 NAT changes.
This commit is contained in:
Pablo Neira Ayuso
2012-09-03 15:28:30 +02:00
parent ce9f3f31ef a2dc375e12
commit ace1fe1231
368 changed files with 6766 additions and 3350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/netfilter/nf_conntrack_ecache.h
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 *