summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-07-24 18:00:05 -0700
committerDavid S. Miller <davem@davemloft.net>2014-07-24 18:00:05 -0700
commit29be6180766eb2a3cb59a0d5a47eb90863cf9019 (patch)
tree36457f9e29365f9762b06c621df89d0589011efa /net
parent11f1fb3459d7b0b36c887dbd930e462f1e011d4d (diff)
parent2627b7e15c5064ddd5e578e4efd948d48d531a3f (diff)
downloadop-kernel-dev-29be6180766eb2a3cb59a0d5a47eb90863cf9019.zip
op-kernel-dev-29be6180766eb2a3cb59a0d5a47eb90863cf9019.tar.gz
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>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/ipvs/ip_vs_conn.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index a8eb0a8..610e19c 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -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.
OpenPOWER on IntegriCloud