git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sunrpc: parse and return errors reported by gssd
[safe/jmp/linux-2.6]
/
net
/
netfilter
/
ipvs
/
ip_vs_proto.c
diff --git
a/net/netfilter/ipvs/ip_vs_proto.c
b/net/netfilter/ipvs/ip_vs_proto.c
index
a01520e
..
3e76716
100644
(file)
--- a/
net/netfilter/ipvs/ip_vs_proto.c
+++ b/
net/netfilter/ipvs/ip_vs_proto.c
@@
-13,6
+13,9
@@
*
*/
*
*/
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/skbuff.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/skbuff.h>
@@
-124,7
+127,8
@@
ip_vs_create_timeout_table(int *table, int size)
* Set timeout value for state specified by name
*/
int
* Set timeout value for state specified by name
*/
int
-ip_vs_set_state_timeout(int *table, int num, char **names, char *name, int to)
+ip_vs_set_state_timeout(int *table, int num, const char *const *names,
+ const char *name, int to)
{
int i;
{
int i;
@@
-181,7
+185,7
@@
ip_vs_tcpudp_debug_packet_v4(struct ip_vs_protocol *pp,
&ih->daddr, ntohs(pptr[1]));
}
&ih->daddr, ntohs(pptr[1]));
}
- pr
intk(KERN_DEBUG "IPVS:
%s: %s\n", msg, buf);
+ pr
_debug("
%s: %s\n", msg, buf);
}
#ifdef CONFIG_IP_VS_IPV6
}
#ifdef CONFIG_IP_VS_IPV6
@@
-215,7
+219,7
@@
ip_vs_tcpudp_debug_packet_v6(struct ip_vs_protocol *pp,
&ih->daddr, ntohs(pptr[1]));
}
&ih->daddr, ntohs(pptr[1]));
}
- pr
intk(KERN_DEBUG "IPVS:
%s: %s\n", msg, buf);
+ pr
_debug("
%s: %s\n", msg, buf);
}
#endif
}
#endif
@@
-259,7
+263,7
@@
int __init ip_vs_protocol_init(void)
#ifdef CONFIG_IP_VS_PROTO_ESP
REGISTER_PROTOCOL(&ip_vs_protocol_esp);
#endif
#ifdef CONFIG_IP_VS_PROTO_ESP
REGISTER_PROTOCOL(&ip_vs_protocol_esp);
#endif
-
IP_VS_INFO
("Registered protocols (%s)\n", &protocols[2]);
+
pr_info
("Registered protocols (%s)\n", &protocols[2]);
return 0;
}
return 0;
}