aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/bridge/netfilter/ebt_ulog.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
index 80c78c5611b4..ac6fa43c8ec9 100644
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
@@ -287,13 +287,13 @@ static struct nf_logger ebt_ulog_logger __read_mostly = {
287 287
288static int __init ebt_ulog_init(void) 288static int __init ebt_ulog_init(void)
289{ 289{
290 bool ret = true; 290 int ret;
291 int i; 291 int i;
292 292
293 if (nlbufsiz >= 128*1024) { 293 if (nlbufsiz >= 128*1024) {
294 printk(KERN_NOTICE "ebt_ulog: Netlink buffer has to be <= 128kB," 294 printk(KERN_NOTICE "ebt_ulog: Netlink buffer has to be <= 128kB,"
295 " please try a smaller nlbufsiz parameter.\n"); 295 " please try a smaller nlbufsiz parameter.\n");
296 return false; 296 return -EINVAL;
297 } 297 }
298 298
299 /* initialize ulog_buffers */ 299 /* initialize ulog_buffers */
@@ -308,12 +308,12 @@ static int __init ebt_ulog_init(void)
308 if (!ebtulognl) { 308 if (!ebtulognl) {
309 printk(KERN_WARNING KBUILD_MODNAME ": out of memory trying to " 309 printk(KERN_WARNING KBUILD_MODNAME ": out of memory trying to "
310 "call netlink_kernel_create\n"); 310 "call netlink_kernel_create\n");
311 ret = false; 311 ret = -ENOMEM;
312 } else if (xt_register_target(&ebt_ulog_tg_reg) != 0) { 312 } else if ((ret = xt_register_target(&ebt_ulog_tg_reg)) != 0) {
313 netlink_kernel_release(ebtulognl); 313 netlink_kernel_release(ebtulognl);
314 } 314 }
315 315
316 if (ret) 316 if (ret == 0)
317 nf_log_register(NFPROTO_BRIDGE, &ebt_ulog_logger); 317 nf_log_register(NFPROTO_BRIDGE, &ebt_ulog_logger);
318 318
319 return ret; 319 return ret;