summaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-04-08 13:39:54 -0700
committerDavid S. Miller <davem@davemloft.net>2009-04-08 13:39:54 -0700
commitfd1cc4802482d13ba1dbc44b390c5a6b16411a03 (patch)
treec9ce26890f0e8da455396121e3f8ed4dfb9daad2 /net/ipv6
parent577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff)
parent83731671d9e6878c0a05d309c68fb71c16d3235a (diff)
downloadop-kernel-dev-fd1cc4802482d13ba1dbc44b390c5a6b16411a03.zip
op-kernel-dev-fd1cc4802482d13ba1dbc44b390c5a6b16411a03.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/netfilter/ip6_tables.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index dfed176..800ae85 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -1033,6 +1033,8 @@ static struct xt_counters *alloc_counters(struct xt_table *table)
xt_free_table_info(info);
+ return counters;
+
free_counters:
vfree(counters);
nomem:
OpenPOWER on IntegriCloud