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: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
29be618076
|
@ -797,7 +797,6 @@ static void ip_vs_conn_expire(unsigned long data)
|
|||
ip_vs_control_del(cp);
|
||||
|
||||
if (cp->flags & IP_VS_CONN_F_NFCT) {
|
||||
ip_vs_conn_drop_conntrack(cp);
|
||||
/* Do not access conntracks during subsys cleanup
|
||||
* because nf_conntrack_find_get can not be used after
|
||||
* conntrack cleanup for the net.
|
||||
|
|
Loading…
Reference in New Issue