[netfilter-cvslog] r6785 - trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter

[kadlec at netfilter.org]

Author: kadlec at netfilter.org
Date: 2007-03-28 18:59:16 +0200 (Wed, 28 Mar 2007)
New Revision: 6785

Modified:
   trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set.c
Log:
Stupid kmalloc flag bug fixed.


Modified: trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set.c	2007-03-22 01:02:12 UTC (rev 6784)
+++ trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set.c	2007-03-28 16:59:16 UTC (rev 6785)
@@ -150,7 +150,7 @@
 	write_lock_bh(&ip_set_lock);
 	set_hash = __ip_set_find(key, id, ip);
 	if (!set_hash) {
-		set_hash = kmalloc(sizeof(struct ip_set_hash), GFP_KERNEL);
+		set_hash = kmalloc(sizeof(struct ip_set_hash), GFP_ATOMIC);
 		if (!set_hash) {
 			ret = -ENOMEM;
 			goto unlock;