diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-03 19:15:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-03 19:15:48 -0400 |
| commit | 9b461783d3d49c74665b55b8ae1b7a1c038177a9 (patch) | |
| tree | e4f27485a0669871a6e331b6daf64157bec4447a /net | |
| parent | cff4c16296754888b6fd8c886bc860a888e20257 (diff) | |
| parent | 44b52bccf855b0706de624c29fc3d82ca954bb4e (diff) | |
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: | |||
| 281 | info->ct = ct; | 281 | info->ct = ct; |
| 282 | return 0; | 282 | return 0; |
| 283 | 283 | ||
| 284 | #ifdef CONFIG_NF_CONNTRACK_TIMEOUT | ||
| 284 | err4: | 285 | err4: |
| 285 | rcu_read_unlock(); | 286 | rcu_read_unlock(); |
| 287 | #endif | ||
| 286 | err3: | 288 | err3: |
| 287 | nf_conntrack_free(ct); | 289 | nf_conntrack_free(ct); |
| 288 | err2: | 290 | err2: |