diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-04 01:15:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-04 01:15:48 +0200 |
| commit | 9b461783d3d49c74665b55b8ae1b7a1c038177a9 (patch) | |
| tree | e4f27485a0669871a6e331b6daf64157bec4447a /net | |
| parent | r8169: enable napi on resume. (diff) | |
| parent | netfilter: xt_CT: remove a compile warning (diff) | |
| download | linux-9b461783d3d49c74665b55b8ae1b7a1c038177a9.tar.xz linux-9b461783d3d49c74665b55b8ae1b7a1c038177a9.zip | |
Merge branch 'master' of git://1984.lsi.us.es/net
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/xt_CT.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c index 0c8e43810ce3..138b75e41fdd 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: |