projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: Convert printks to pr_<level>
[deliverable/linux.git]
/
net
/
ipv4
/
af_inet.c
diff --git
a/net/ipv4/af_inet.c
b/net/ipv4/af_inet.c
index e588a34e85c261e92c8d26694011cfd8f99e5a04..b7a946611f2f6f263b2117949231d31a5b6ad722 100644
(file)
--- a/
net/ipv4/af_inet.c
+++ b/
net/ipv4/af_inet.c
@@
-1085,13
+1085,11
@@
out:
return;
out_permanent:
return;
out_permanent:
- printk(KERN_ERR "Attempt to override permanent protocol %d.\n",
- protocol);
+ pr_err("Attempt to override permanent protocol %d\n", protocol);
goto out;
out_illegal:
goto out;
out_illegal:
- printk(KERN_ERR
- "Ignoring attempt to register invalid socket type %d.\n",
+ pr_err("Ignoring attempt to register invalid socket type %d\n",
p->type);
goto out;
}
p->type);
goto out;
}
@@
-1100,8
+1098,7
@@
EXPORT_SYMBOL(inet_register_protosw);
void inet_unregister_protosw(struct inet_protosw *p)
{
if (INET_PROTOSW_PERMANENT & p->flags) {
void inet_unregister_protosw(struct inet_protosw *p)
{
if (INET_PROTOSW_PERMANENT & p->flags) {
- printk(KERN_ERR
- "Attempt to unregister permanent protocol %d.\n",
+ pr_err("Attempt to unregister permanent protocol %d\n",
p->protocol);
} else {
spin_lock_bh(&inetsw_lock);
p->protocol);
} else {
spin_lock_bh(&inetsw_lock);
@@
-1150,8
+1147,8
@@
static int inet_sk_reselect_saddr(struct sock *sk)
return 0;
if (sysctl_ip_dynaddr > 1) {
return 0;
if (sysctl_ip_dynaddr > 1) {
- pr
intk(KERN_INFO
"%s(): shifting inet->saddr from %pI4 to %pI4\n",
- __func__, &old_saddr, &new_saddr);
+ pr
_info(
"%s(): shifting inet->saddr from %pI4 to %pI4\n",
+
__func__, &old_saddr, &new_saddr);
}
inet->inet_saddr = inet->inet_rcv_saddr = new_saddr;
}
inet->inet_saddr = inet->inet_rcv_saddr = new_saddr;
@@
-1680,14
+1677,14
@@
static int __init inet_init(void)
*/
if (inet_add_protocol(&icmp_protocol, IPPROTO_ICMP) < 0)
*/
if (inet_add_protocol(&icmp_protocol, IPPROTO_ICMP) < 0)
- pr
intk(KERN_CRIT "inet_init: Cannot add ICMP protocol\n"
);
+ pr
_crit("%s: Cannot add ICMP protocol\n", __func__
);
if (inet_add_protocol(&udp_protocol, IPPROTO_UDP) < 0)
if (inet_add_protocol(&udp_protocol, IPPROTO_UDP) < 0)
- pr
intk(KERN_CRIT "inet_init: Cannot add UDP protocol\n"
);
+ pr
_crit("%s: Cannot add UDP protocol\n", __func__
);
if (inet_add_protocol(&tcp_protocol, IPPROTO_TCP) < 0)
if (inet_add_protocol(&tcp_protocol, IPPROTO_TCP) < 0)
- pr
intk(KERN_CRIT "inet_init: Cannot add TCP protocol\n"
);
+ pr
_crit("%s: Cannot add TCP protocol\n", __func__
);
#ifdef CONFIG_IP_MULTICAST
if (inet_add_protocol(&igmp_protocol, IPPROTO_IGMP) < 0)
#ifdef CONFIG_IP_MULTICAST
if (inet_add_protocol(&igmp_protocol, IPPROTO_IGMP) < 0)
- pr
intk(KERN_CRIT "inet_init: Cannot add IGMP protocol\n"
);
+ pr
_crit("%s: Cannot add IGMP protocol\n", __func__
);
#endif
/* Register the socket-side information for inet_create. */
#endif
/* Register the socket-side information for inet_create. */
@@
-1734,14
+1731,14
@@
static int __init inet_init(void)
*/
#if defined(CONFIG_IP_MROUTE)
if (ip_mr_init())
*/
#if defined(CONFIG_IP_MROUTE)
if (ip_mr_init())
- pr
intk(KERN_CRIT "inet_init: Cannot init ipv4 mroute\n"
);
+ pr
_crit("%s: Cannot init ipv4 mroute\n", __func__
);
#endif
/*
* Initialise per-cpu ipv4 mibs
*/
if (init_ipv4_mibs())
#endif
/*
* Initialise per-cpu ipv4 mibs
*/
if (init_ipv4_mibs())
- pr
intk(KERN_CRIT "inet_init: Cannot init ipv4 mibs\n"
);
+ pr
_crit("%s: Cannot init ipv4 mibs\n", __func__
);
ipv4_proc_init();
ipv4_proc_init();
This page took
0.025009 seconds
and
5
git commands to generate.