projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[cascardo/linux.git]
/
net
/
netfilter
/
nf_conntrack_irc.c
diff --git
a/net/netfilter/nf_conntrack_irc.c
b/net/netfilter/nf_conntrack_irc.c
index
7673930
..
b394aa3
100644
(file)
--- a/
net/netfilter/nf_conntrack_irc.c
+++ b/
net/netfilter/nf_conntrack_irc.c
@@
-235,7
+235,7
@@
static int __init nf_conntrack_irc_init(void)
char *tmpname;
if (max_dcc_channels < 1) {
char *tmpname;
if (max_dcc_channels < 1) {
- printk("nf_ct_irc: max_dcc_channels must not be zero\n");
+ printk(
KERN_ERR
"nf_ct_irc: max_dcc_channels must not be zero\n");
return -EINVAL;
}
return -EINVAL;
}
@@
-267,7
+267,7
@@
static int __init nf_conntrack_irc_init(void)
ret = nf_conntrack_helper_register(&irc[i]);
if (ret) {
ret = nf_conntrack_helper_register(&irc[i]);
if (ret) {
- printk("nf_ct_irc: failed to register helper "
+ printk(
KERN_ERR
"nf_ct_irc: failed to register helper "
"for pf: %u port: %u\n",
irc[i].tuple.src.l3num, ports[i]);
nf_conntrack_irc_fini();
"for pf: %u port: %u\n",
irc[i].tuple.src.l3num, ports[i]);
nf_conntrack_irc_fini();