Commit 29be6180 authored by David S. Miller's avatar David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Via Simon Horman, I received the following one-liner for your net tree:

1) Fix crash when exiting from netns that uses IPVS and conntrack,
   from Julian Anastasov via Simon Horman.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 11f1fb34 2627b7e1
...@@ -797,7 +797,6 @@ static void ip_vs_conn_expire(unsigned long data) ...@@ -797,7 +797,6 @@ static void ip_vs_conn_expire(unsigned long data)
ip_vs_control_del(cp); ip_vs_control_del(cp);
if (cp->flags & IP_VS_CONN_F_NFCT) { if (cp->flags & IP_VS_CONN_F_NFCT) {
ip_vs_conn_drop_conntrack(cp);
/* Do not access conntracks during subsys cleanup /* Do not access conntracks during subsys cleanup
* because nf_conntrack_find_get can not be used after * because nf_conntrack_find_get can not be used after
* conntrack cleanup for the net. * conntrack cleanup for the net.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment