diff options
author | Eric Leblond <eric@inl.fr> | 2009-03-26 04:04:02 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-26 04:04:02 -0400 |
commit | 3b334d427cb9c866216820bfad0d8318869cc154 (patch) | |
tree | 9be09d6e37f0ab048bd02cc1491f072b55901512 /net/bridge | |
parent | 704b3ea3b9b4ea0e115208946abd5c8a64080113 (diff) |
netfilter: fix warning in ebt_ulog init function.
The ebt_ulog module does not follow the fixed convention about function
return. Loading the module is triggering the following message:
sys_init_module: 'ebt_ulog'->init suspiciously returned 1, it should follow 0/-E convention
sys_init_module: loading module anyway...
Pid: 2334, comm: modprobe Not tainted 2.6.29-rc5edenwall0-00883-g199e57b #146
Call Trace:
[<c0441b81>] ? printk+0xf/0x16
[<c02311af>] sys_init_module+0x107/0x186
[<c0202cfa>] syscall_call+0x7/0xb
The following patch fixes the return treatment in ebt_ulog_init()
function.
Signed-off-by: Eric Leblond <eric@inl.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/netfilter/ebt_ulog.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c index 80c78c5611b..ac6fa43c8ec 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 | ||
288 | static int __init ebt_ulog_init(void) | 288 | static 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; |