diff options
24 files changed, 134 insertions, 63 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index bbae1e87efcd..910820327bc4 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
@@ -99,47 +99,47 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len, | |||
99 | return &buf[*idx - len]; | 99 | return &buf[*idx - len]; |
100 | } | 100 | } |
101 | 101 | ||
102 | #define IP_VS_DBG_BUF(level, msg...) \ | 102 | #define IP_VS_DBG_BUF(level, msg, ...) \ |
103 | do { \ | 103 | do { \ |
104 | char ip_vs_dbg_buf[160]; \ | 104 | char ip_vs_dbg_buf[160]; \ |
105 | int ip_vs_dbg_idx = 0; \ | 105 | int ip_vs_dbg_idx = 0; \ |
106 | if (level <= ip_vs_get_debug_level()) \ | 106 | if (level <= ip_vs_get_debug_level()) \ |
107 | printk(KERN_DEBUG "IPVS: " msg); \ | 107 | printk(KERN_DEBUG pr_fmt(msg), ##__VA_ARGS__); \ |
108 | } while (0) | 108 | } while (0) |
109 | #define IP_VS_ERR_BUF(msg...) \ | 109 | #define IP_VS_ERR_BUF(msg...) \ |
110 | do { \ | 110 | do { \ |
111 | char ip_vs_dbg_buf[160]; \ | 111 | char ip_vs_dbg_buf[160]; \ |
112 | int ip_vs_dbg_idx = 0; \ | 112 | int ip_vs_dbg_idx = 0; \ |
113 | printk(KERN_ERR "IPVS: " msg); \ | 113 | pr_err(msg); \ |
114 | } while (0) | 114 | } while (0) |
115 | 115 | ||
116 | /* Only use from within IP_VS_DBG_BUF() or IP_VS_ERR_BUF macros */ | 116 | /* Only use from within IP_VS_DBG_BUF() or IP_VS_ERR_BUF macros */ |
117 | #define IP_VS_DBG_ADDR(af, addr) \ | 117 | #define IP_VS_DBG_ADDR(af, addr) \ |
118 | ip_vs_dbg_addr(af, ip_vs_dbg_buf, \ | 118 | ip_vs_dbg_addr(af, ip_vs_dbg_buf, \ |
119 | sizeof(ip_vs_dbg_buf), addr, \ | 119 | sizeof(ip_vs_dbg_buf), addr, \ |
120 | &ip_vs_dbg_idx) | 120 | &ip_vs_dbg_idx) |
121 | 121 | ||
122 | #define IP_VS_DBG(level, msg...) \ | 122 | #define IP_VS_DBG(level, msg, ...) \ |
123 | do { \ | 123 | do { \ |
124 | if (level <= ip_vs_get_debug_level()) \ | 124 | if (level <= ip_vs_get_debug_level()) \ |
125 | printk(KERN_DEBUG "IPVS: " msg); \ | 125 | printk(KERN_DEBUG pr_fmt(msg), ##__VA_ARGS__); \ |
126 | } while (0) | 126 | } while (0) |
127 | #define IP_VS_DBG_RL(msg...) \ | 127 | #define IP_VS_DBG_RL(msg, ...) \ |
128 | do { \ | 128 | do { \ |
129 | if (net_ratelimit()) \ | 129 | if (net_ratelimit()) \ |
130 | printk(KERN_DEBUG "IPVS: " msg); \ | 130 | printk(KERN_DEBUG pr_fmt(msg), ##__VA_ARGS__); \ |
131 | } while (0) | 131 | } while (0) |
132 | #define IP_VS_DBG_PKT(level, pp, skb, ofs, msg) \ | 132 | #define IP_VS_DBG_PKT(level, pp, skb, ofs, msg) \ |
133 | do { \ | 133 | do { \ |
134 | if (level <= ip_vs_get_debug_level()) \ | 134 | if (level <= ip_vs_get_debug_level()) \ |
135 | pp->debug_packet(pp, skb, ofs, msg); \ | 135 | pp->debug_packet(pp, skb, ofs, msg); \ |
136 | } while (0) | 136 | } while (0) |
137 | #define IP_VS_DBG_RL_PKT(level, pp, skb, ofs, msg) \ | 137 | #define IP_VS_DBG_RL_PKT(level, pp, skb, ofs, msg) \ |
138 | do { \ | 138 | do { \ |
139 | if (level <= ip_vs_get_debug_level() && \ | 139 | if (level <= ip_vs_get_debug_level() && \ |
140 | net_ratelimit()) \ | 140 | net_ratelimit()) \ |
141 | pp->debug_packet(pp, skb, ofs, msg); \ | 141 | pp->debug_packet(pp, skb, ofs, msg); \ |
142 | } while (0) | 142 | } while (0) |
143 | #else /* NO DEBUGGING at ALL */ | 143 | #else /* NO DEBUGGING at ALL */ |
144 | #define IP_VS_DBG_BUF(level, msg...) do {} while (0) | 144 | #define IP_VS_DBG_BUF(level, msg...) do {} while (0) |
145 | #define IP_VS_ERR_BUF(msg...) do {} while (0) | 145 | #define IP_VS_ERR_BUF(msg...) do {} while (0) |
@@ -150,29 +150,30 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len, | |||
150 | #endif | 150 | #endif |
151 | 151 | ||
152 | #define IP_VS_BUG() BUG() | 152 | #define IP_VS_BUG() BUG() |
153 | #define IP_VS_ERR(msg...) printk(KERN_ERR "IPVS: " msg) | 153 | #define IP_VS_ERR(msg...) pr_err(msg) |
154 | #define IP_VS_INFO(msg...) printk(KERN_INFO "IPVS: " msg) | 154 | #define IP_VS_INFO(msg...) pr_info(msg) |
155 | #define IP_VS_WARNING(msg...) \ | 155 | #define IP_VS_WARNING(msg...) pr_warning(msg) |
156 | printk(KERN_WARNING "IPVS: " msg) | 156 | #define IP_VS_ERR_RL(msg...) \ |
157 | #define IP_VS_ERR_RL(msg...) \ | 157 | do { \ |
158 | do { \ | 158 | if (net_ratelimit()) \ |
159 | if (net_ratelimit()) \ | 159 | pr_err(msg); \ |
160 | printk(KERN_ERR "IPVS: " msg); \ | 160 | } while (0) |
161 | } while (0) | ||
162 | 161 | ||
163 | #ifdef CONFIG_IP_VS_DEBUG | 162 | #ifdef CONFIG_IP_VS_DEBUG |
164 | #define EnterFunction(level) \ | 163 | #define EnterFunction(level) \ |
165 | do { \ | 164 | do { \ |
166 | if (level <= ip_vs_get_debug_level()) \ | 165 | if (level <= ip_vs_get_debug_level()) \ |
167 | printk(KERN_DEBUG "Enter: %s, %s line %i\n", \ | 166 | printk(KERN_DEBUG \ |
168 | __func__, __FILE__, __LINE__); \ | 167 | pr_fmt("Enter: %s, %s line %i\n"), \ |
169 | } while (0) | 168 | __func__, __FILE__, __LINE__); \ |
170 | #define LeaveFunction(level) \ | 169 | } while (0) |
171 | do { \ | 170 | #define LeaveFunction(level) \ |
172 | if (level <= ip_vs_get_debug_level()) \ | 171 | do { \ |
173 | printk(KERN_DEBUG "Leave: %s, %s line %i\n", \ | 172 | if (level <= ip_vs_get_debug_level()) \ |
174 | __func__, __FILE__, __LINE__); \ | 173 | printk(KERN_DEBUG \ |
175 | } while (0) | 174 | pr_fmt("Leave: %s, %s line %i\n"), \ |
175 | __func__, __FILE__, __LINE__); \ | ||
176 | } while (0) | ||
176 | #else | 177 | #else |
177 | #define EnterFunction(level) do {} while (0) | 178 | #define EnterFunction(level) do {} while (0) |
178 | #define LeaveFunction(level) do {} while (0) | 179 | #define LeaveFunction(level) do {} while (0) |
diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c index 201b8ea3020d..c1781f80daf2 100644 --- a/net/netfilter/ipvs/ip_vs_app.c +++ b/net/netfilter/ipvs/ip_vs_app.c | |||
@@ -18,6 +18,9 @@ | |||
18 | * | 18 | * |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #define KMSG_COMPONENT "IPVS" | ||
22 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
23 | |||
21 | #include <linux/module.h> | 24 | #include <linux/module.h> |
22 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
23 | #include <linux/skbuff.h> | 26 | #include <linux/skbuff.h> |
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c index 77bfdfeb966e..4173d7b1d4cc 100644 --- a/net/netfilter/ipvs/ip_vs_conn.c +++ b/net/netfilter/ipvs/ip_vs_conn.c | |||
@@ -22,6 +22,9 @@ | |||
22 | * | 22 | * |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #define KMSG_COMPONENT "IPVS" | ||
26 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
27 | |||
25 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
26 | #include <linux/in.h> | 29 | #include <linux/in.h> |
27 | #include <linux/net.h> | 30 | #include <linux/net.h> |
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c index 8dddb17a947a..6811dcaca0f6 100644 --- a/net/netfilter/ipvs/ip_vs_core.c +++ b/net/netfilter/ipvs/ip_vs_core.c | |||
@@ -24,6 +24,9 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #define KMSG_COMPONENT "IPVS" | ||
28 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
29 | |||
27 | #include <linux/module.h> | 30 | #include <linux/module.h> |
28 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
29 | #include <linux/ip.h> | 32 | #include <linux/ip.h> |
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 2d24d81474ce..e6133ea1ea4c 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c | |||
@@ -18,6 +18,9 @@ | |||
18 | * | 18 | * |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #define KMSG_COMPONENT "IPVS" | ||
22 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
23 | |||
21 | #include <linux/module.h> | 24 | #include <linux/module.h> |
22 | #include <linux/init.h> | 25 | #include <linux/init.h> |
23 | #include <linux/types.h> | 26 | #include <linux/types.h> |
diff --git a/net/netfilter/ipvs/ip_vs_dh.c b/net/netfilter/ipvs/ip_vs_dh.c index a9dac74bb13f..d0c0594d1e2e 100644 --- a/net/netfilter/ipvs/ip_vs_dh.c +++ b/net/netfilter/ipvs/ip_vs_dh.c | |||
@@ -35,6 +35,9 @@ | |||
35 | * | 35 | * |
36 | */ | 36 | */ |
37 | 37 | ||
38 | #define KMSG_COMPONENT "IPVS" | ||
39 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
40 | |||
38 | #include <linux/ip.h> | 41 | #include <linux/ip.h> |
39 | #include <linux/module.h> | 42 | #include <linux/module.h> |
40 | #include <linux/kernel.h> | 43 | #include <linux/kernel.h> |
diff --git a/net/netfilter/ipvs/ip_vs_est.c b/net/netfilter/ipvs/ip_vs_est.c index 2eb2860dabb5..702b53ca937c 100644 --- a/net/netfilter/ipvs/ip_vs_est.c +++ b/net/netfilter/ipvs/ip_vs_est.c | |||
@@ -11,6 +11,10 @@ | |||
11 | * Changes: | 11 | * Changes: |
12 | * | 12 | * |
13 | */ | 13 | */ |
14 | |||
15 | #define KMSG_COMPONENT "IPVS" | ||
16 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
17 | |||
14 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
15 | #include <linux/jiffies.h> | 19 | #include <linux/jiffies.h> |
16 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c index 428edbf481cc..9c16a3f64c1b 100644 --- a/net/netfilter/ipvs/ip_vs_ftp.c +++ b/net/netfilter/ipvs/ip_vs_ftp.c | |||
@@ -22,6 +22,9 @@ | |||
22 | * | 22 | * |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #define KMSG_COMPONENT "IPVS" | ||
26 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
27 | |||
25 | #include <linux/module.h> | 28 | #include <linux/module.h> |
26 | #include <linux/moduleparam.h> | 29 | #include <linux/moduleparam.h> |
27 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c index 3eb5e2660c49..98fb185d890b 100644 --- a/net/netfilter/ipvs/ip_vs_lblc.c +++ b/net/netfilter/ipvs/ip_vs_lblc.c | |||
@@ -39,6 +39,9 @@ | |||
39 | * me to write this module. | 39 | * me to write this module. |
40 | */ | 40 | */ |
41 | 41 | ||
42 | #define KMSG_COMPONENT "IPVS" | ||
43 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
44 | |||
42 | #include <linux/ip.h> | 45 | #include <linux/ip.h> |
43 | #include <linux/module.h> | 46 | #include <linux/module.h> |
44 | #include <linux/kernel.h> | 47 | #include <linux/kernel.h> |
diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c index c04ce56c7f0f..5f5e5f4bad5e 100644 --- a/net/netfilter/ipvs/ip_vs_lblcr.c +++ b/net/netfilter/ipvs/ip_vs_lblcr.c | |||
@@ -37,6 +37,9 @@ | |||
37 | * | 37 | * |
38 | */ | 38 | */ |
39 | 39 | ||
40 | #define KMSG_COMPONENT "IPVS" | ||
41 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
42 | |||
40 | #include <linux/ip.h> | 43 | #include <linux/ip.h> |
41 | #include <linux/module.h> | 44 | #include <linux/module.h> |
42 | #include <linux/kernel.h> | 45 | #include <linux/kernel.h> |
diff --git a/net/netfilter/ipvs/ip_vs_lc.c b/net/netfilter/ipvs/ip_vs_lc.c index d0dadc8a65fd..4ecd5e19c39a 100644 --- a/net/netfilter/ipvs/ip_vs_lc.c +++ b/net/netfilter/ipvs/ip_vs_lc.c | |||
@@ -14,6 +14,9 @@ | |||
14 | * | 14 | * |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #define KMSG_COMPONENT "IPVS" | ||
18 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
19 | |||
17 | #include <linux/module.h> | 20 | #include <linux/module.h> |
18 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
19 | 22 | ||
diff --git a/net/netfilter/ipvs/ip_vs_nq.c b/net/netfilter/ipvs/ip_vs_nq.c index 694952db5026..2224478bdea8 100644 --- a/net/netfilter/ipvs/ip_vs_nq.c +++ b/net/netfilter/ipvs/ip_vs_nq.c | |||
@@ -31,6 +31,9 @@ | |||
31 | * | 31 | * |
32 | */ | 32 | */ |
33 | 33 | ||
34 | #define KMSG_COMPONENT "IPVS" | ||
35 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
36 | |||
34 | #include <linux/module.h> | 37 | #include <linux/module.h> |
35 | #include <linux/kernel.h> | 38 | #include <linux/kernel.h> |
36 | 39 | ||
diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c index a01520e3d6b8..a95bc4021c90 100644 --- a/net/netfilter/ipvs/ip_vs_proto.c +++ b/net/netfilter/ipvs/ip_vs_proto.c | |||
@@ -13,6 +13,9 @@ | |||
13 | * | 13 | * |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #define KMSG_COMPONENT "IPVS" | ||
17 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
18 | |||
16 | #include <linux/module.h> | 19 | #include <linux/module.h> |
17 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
18 | #include <linux/skbuff.h> | 21 | #include <linux/skbuff.h> |
@@ -181,7 +184,7 @@ ip_vs_tcpudp_debug_packet_v4(struct ip_vs_protocol *pp, | |||
181 | &ih->daddr, ntohs(pptr[1])); | 184 | &ih->daddr, ntohs(pptr[1])); |
182 | } | 185 | } |
183 | 186 | ||
184 | printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf); | 187 | pr_debug("%s: %s\n", msg, buf); |
185 | } | 188 | } |
186 | 189 | ||
187 | #ifdef CONFIG_IP_VS_IPV6 | 190 | #ifdef CONFIG_IP_VS_IPV6 |
@@ -215,7 +218,7 @@ ip_vs_tcpudp_debug_packet_v6(struct ip_vs_protocol *pp, | |||
215 | &ih->daddr, ntohs(pptr[1])); | 218 | &ih->daddr, ntohs(pptr[1])); |
216 | } | 219 | } |
217 | 220 | ||
218 | printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf); | 221 | pr_debug("%s: %s\n", msg, buf); |
219 | } | 222 | } |
220 | #endif | 223 | #endif |
221 | 224 | ||
diff --git a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c index 79f56c1e7c19..c30b43c36cd7 100644 --- a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c +++ b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c | |||
@@ -10,6 +10,9 @@ | |||
10 | * | 10 | * |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #define KMSG_COMPONENT "IPVS" | ||
14 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
15 | |||
13 | #include <linux/in.h> | 16 | #include <linux/in.h> |
14 | #include <linux/ip.h> | 17 | #include <linux/ip.h> |
15 | #include <linux/module.h> | 18 | #include <linux/module.h> |
@@ -138,7 +141,7 @@ ah_esp_debug_packet_v4(struct ip_vs_protocol *pp, const struct sk_buff *skb, | |||
138 | sprintf(buf, "%s %pI4->%pI4", | 141 | sprintf(buf, "%s %pI4->%pI4", |
139 | pp->name, &ih->saddr, &ih->daddr); | 142 | pp->name, &ih->saddr, &ih->daddr); |
140 | 143 | ||
141 | printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf); | 144 | pr_debug("%s: %s\n", msg, buf); |
142 | } | 145 | } |
143 | 146 | ||
144 | #ifdef CONFIG_IP_VS_IPV6 | 147 | #ifdef CONFIG_IP_VS_IPV6 |
@@ -156,7 +159,7 @@ ah_esp_debug_packet_v6(struct ip_vs_protocol *pp, const struct sk_buff *skb, | |||
156 | sprintf(buf, "%s %pI6->%pI6", | 159 | sprintf(buf, "%s %pI6->%pI6", |
157 | pp->name, &ih->saddr, &ih->daddr); | 160 | pp->name, &ih->saddr, &ih->daddr); |
158 | 161 | ||
159 | printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf); | 162 | pr_debug("%s: %s\n", msg, buf); |
160 | } | 163 | } |
161 | #endif | 164 | #endif |
162 | 165 | ||
diff --git a/net/netfilter/ipvs/ip_vs_proto_tcp.c b/net/netfilter/ipvs/ip_vs_proto_tcp.c index 8cba41802850..c36c80d3a2b4 100644 --- a/net/netfilter/ipvs/ip_vs_proto_tcp.c +++ b/net/netfilter/ipvs/ip_vs_proto_tcp.c | |||
@@ -13,6 +13,9 @@ | |||
13 | * | 13 | * |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #define KMSG_COMPONENT "IPVS" | ||
17 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
18 | |||
16 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
17 | #include <linux/ip.h> | 20 | #include <linux/ip.h> |
18 | #include <linux/tcp.h> /* for tcphdr */ | 21 | #include <linux/tcp.h> /* for tcphdr */ |
diff --git a/net/netfilter/ipvs/ip_vs_proto_udp.c b/net/netfilter/ipvs/ip_vs_proto_udp.c index d2930a71084b..96ebe40bc537 100644 --- a/net/netfilter/ipvs/ip_vs_proto_udp.c +++ b/net/netfilter/ipvs/ip_vs_proto_udp.c | |||
@@ -13,6 +13,9 @@ | |||
13 | * | 13 | * |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #define KMSG_COMPONENT "IPVS" | ||
17 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
18 | |||
16 | #include <linux/in.h> | 19 | #include <linux/in.h> |
17 | #include <linux/ip.h> | 20 | #include <linux/ip.h> |
18 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
diff --git a/net/netfilter/ipvs/ip_vs_rr.c b/net/netfilter/ipvs/ip_vs_rr.c index 2d16ab7f8c1e..b01007e1c11e 100644 --- a/net/netfilter/ipvs/ip_vs_rr.c +++ b/net/netfilter/ipvs/ip_vs_rr.c | |||
@@ -19,6 +19,9 @@ | |||
19 | * | 19 | * |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #define KMSG_COMPONENT "IPVS" | ||
23 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
24 | |||
22 | #include <linux/module.h> | 25 | #include <linux/module.h> |
23 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
24 | 27 | ||
diff --git a/net/netfilter/ipvs/ip_vs_sched.c b/net/netfilter/ipvs/ip_vs_sched.c index a46ad9e35016..87bc5ea0ef29 100644 --- a/net/netfilter/ipvs/ip_vs_sched.c +++ b/net/netfilter/ipvs/ip_vs_sched.c | |||
@@ -17,6 +17,9 @@ | |||
17 | * | 17 | * |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #define KMSG_COMPONENT "IPVS" | ||
21 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
22 | |||
20 | #include <linux/module.h> | 23 | #include <linux/module.h> |
21 | #include <linux/spinlock.h> | 24 | #include <linux/spinlock.h> |
22 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
diff --git a/net/netfilter/ipvs/ip_vs_sed.c b/net/netfilter/ipvs/ip_vs_sed.c index 20e4657d2f3b..4f745dd86dd8 100644 --- a/net/netfilter/ipvs/ip_vs_sed.c +++ b/net/netfilter/ipvs/ip_vs_sed.c | |||
@@ -35,6 +35,9 @@ | |||
35 | * | 35 | * |
36 | */ | 36 | */ |
37 | 37 | ||
38 | #define KMSG_COMPONENT "IPVS" | ||
39 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
40 | |||
38 | #include <linux/module.h> | 41 | #include <linux/module.h> |
39 | #include <linux/kernel.h> | 42 | #include <linux/kernel.h> |
40 | 43 | ||
diff --git a/net/netfilter/ipvs/ip_vs_sh.c b/net/netfilter/ipvs/ip_vs_sh.c index 75709ebeb630..fb4d2d23f2fe 100644 --- a/net/netfilter/ipvs/ip_vs_sh.c +++ b/net/netfilter/ipvs/ip_vs_sh.c | |||
@@ -32,6 +32,9 @@ | |||
32 | * | 32 | * |
33 | */ | 33 | */ |
34 | 34 | ||
35 | #define KMSG_COMPONENT "IPVS" | ||
36 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
37 | |||
35 | #include <linux/ip.h> | 38 | #include <linux/ip.h> |
36 | #include <linux/module.h> | 39 | #include <linux/module.h> |
37 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c index 5c48378a852f..cc04c99815fd 100644 --- a/net/netfilter/ipvs/ip_vs_sync.c +++ b/net/netfilter/ipvs/ip_vs_sync.c | |||
@@ -17,6 +17,9 @@ | |||
17 | * Justin Ossevoort : Fix endian problem on sync message size. | 17 | * Justin Ossevoort : Fix endian problem on sync message size. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #define KMSG_COMPONENT "IPVS" | ||
21 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
22 | |||
20 | #include <linux/module.h> | 23 | #include <linux/module.h> |
21 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
22 | #include <linux/inetdevice.h> | 25 | #include <linux/inetdevice.h> |
diff --git a/net/netfilter/ipvs/ip_vs_wlc.c b/net/netfilter/ipvs/ip_vs_wlc.c index 8e942565b47d..bbddfdb10db2 100644 --- a/net/netfilter/ipvs/ip_vs_wlc.c +++ b/net/netfilter/ipvs/ip_vs_wlc.c | |||
@@ -19,6 +19,9 @@ | |||
19 | * | 19 | * |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #define KMSG_COMPONENT "IPVS" | ||
23 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
24 | |||
22 | #include <linux/module.h> | 25 | #include <linux/module.h> |
23 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
24 | 27 | ||
diff --git a/net/netfilter/ipvs/ip_vs_wrr.c b/net/netfilter/ipvs/ip_vs_wrr.c index f7d74ef1ecf9..c39ebb6c5a54 100644 --- a/net/netfilter/ipvs/ip_vs_wrr.c +++ b/net/netfilter/ipvs/ip_vs_wrr.c | |||
@@ -18,6 +18,9 @@ | |||
18 | * | 18 | * |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #define KMSG_COMPONENT "IPVS" | ||
22 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
23 | |||
21 | #include <linux/module.h> | 24 | #include <linux/module.h> |
22 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
23 | #include <linux/net.h> | 26 | #include <linux/net.h> |
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c index 5874657af7f2..061e76dfdad9 100644 --- a/net/netfilter/ipvs/ip_vs_xmit.c +++ b/net/netfilter/ipvs/ip_vs_xmit.c | |||
@@ -13,6 +13,9 @@ | |||
13 | * | 13 | * |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #define KMSG_COMPONENT "IPVS" | ||
17 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
18 | |||
16 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
17 | #include <linux/tcp.h> /* for tcphdr */ | 20 | #include <linux/tcp.h> /* for tcphdr */ |
18 | #include <net/ip.h> | 21 | #include <net/ip.h> |