diff options
| author | David S. Miller <davem@davemloft.net> | 2019-10-27 12:13:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-27 12:13:16 -0700 |
| commit | fc11078dd3514c65eabce166b8431a56d8a667cb (patch) | |
| tree | 2278a2e0137a0165b3684338a21a0ab3d38e751f /include/net | |
| parent | 1a51a47491a5a23f0625b03ad6dc84cf39bf6a82 (diff) | |
| parent | 52b33b4f8186669ab88b56cf5b2812e3996ef289 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter/IPVS fixes for net
The following patchset contains Netfilter/IPVS fixes for net:
1) Fix crash on flowtable due to race between garbage collection
and insertion.
2) Restore callback unbinding in netfilter offloads.
3) Fix races on IPVS module removal, from Davide Caratti.
4) Make old_secure_tcp per-netns to fix sysbot report,
from Eric Dumazet.
5) Validate matching length in netfilter offloads, from wenxu.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ip_vs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 3759167f91f5..078887c8c586 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -889,6 +889,7 @@ struct netns_ipvs { struct delayed_work defense_work; /* Work handler */ int drop_rate; int drop_counter; + int old_secure_tcp; atomic_t dropentry; /* locks in ctl.c */ spinlock_t dropentry_lock; /* drop entry handling */ |