Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

2009-04-08 13:39:54 -07:00
parent 577c9c456f 83731671d9
commit fd1cc48024
4 changed files with 14 additions and 27 deletions
--- 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: