summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-04-03 19:15:48 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-03 19:15:48 -0400
commit9b461783d3d49c74665b55b8ae1b7a1c038177a9 (patch)
treee4f27485a0669871a6e331b6daf64157bec4447a /net
parentcff4c16296754888b6fd8c886bc860a888e20257 (diff)
parent44b52bccf855b0706de624c29fc3d82ca954bb4e (diff)
downloadlinux-3.10-9b461783d3d49c74665b55b8ae1b7a1c038177a9.tar.gz
linux-3.10-9b461783d3d49c74665b55b8ae1b7a1c038177a9.tar.bz2
linux-3.10-9b461783d3d49c74665b55b8ae1b7a1c038177a9.zip
Merge branch 'master' of git://1984.lsi.us.es/net
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/xt_CT.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c
index 0c8e43810ce..138b75e41fd 100644
--- a/net/netfilter/xt_CT.c
+++ b/net/netfilter/xt_CT.c
@@ -281,8 +281,10 @@ out:
info->ct = ct;
return 0;
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
err4:
rcu_read_unlock();
+#endif
err3:
nf_conntrack_free(ct);
err2: