From f91b5e0ce227d3b49d0e30cfc2d9060c71e5e9c8 Mon Sep 17 00:00:00 2001
From: Eric Leblond <eric@inl.fr>
Date: Thu, 26 Mar 2009 01:04:02 -0700
Subject: [PATCH] --- yaml --- r: 135547 b: refs/heads/master c:
 3b334d427cb9c866216820bfad0d8318869cc154 h: refs/heads/master i:   135545:
 83c83e8794f3fab2a0405da65ffc99d4cae92ffb   135543:
 e4ef605ef7bd86e5c9265157235d6ff1eb0673b4 v: v3

---
 [refs]                                |  2 +-
 trunk/net/bridge/netfilter/ebt_ulog.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ff1162a649e7..389faec344cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 704b3ea3b9b4ea0e115208946abd5c8a64080113
+refs/heads/master: 3b334d427cb9c866216820bfad0d8318869cc154
diff --git a/trunk/net/bridge/netfilter/ebt_ulog.c b/trunk/net/bridge/netfilter/ebt_ulog.c
index 80c78c5611b4..ac6fa43c8ec9 100644
--- a/trunk/net/bridge/netfilter/ebt_ulog.c
+++ b/trunk/net/bridge/netfilter/ebt_ulog.c
@@ -287,13 +287,13 @@ static struct nf_logger ebt_ulog_logger __read_mostly = {
 
 static int __init ebt_ulog_init(void)
 {
-	bool ret = true;
+	int ret;
 	int i;
 
 	if (nlbufsiz >= 128*1024) {
 		printk(KERN_NOTICE "ebt_ulog: Netlink buffer has to be <= 128kB,"
 		       " please try a smaller nlbufsiz parameter.\n");
-		return false;
+		return -EINVAL;
 	}
 
 	/* initialize ulog_buffers */
@@ -308,12 +308,12 @@ static int __init ebt_ulog_init(void)
 	if (!ebtulognl) {
 		printk(KERN_WARNING KBUILD_MODNAME ": out of memory trying to "
 		       "call netlink_kernel_create\n");
-		ret = false;
-	} else if (xt_register_target(&ebt_ulog_tg_reg) != 0) {
+		ret = -ENOMEM;
+	} else if ((ret = xt_register_target(&ebt_ulog_tg_reg)) != 0) {
 		netlink_kernel_release(ebtulognl);
 	}
 
-	if (ret)
+	if (ret == 0)
 		nf_log_register(NFPROTO_BRIDGE, &ebt_ulog_logger);
 
 	return ret;