[PATCH 2.4/2.6] IPVS: code tidy up

[PATCH 2.4/2.6] IPVS: code tidy up

[Wensong Zhang]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 137 bytes --]



Hi,

Here are the minor patches for IPVS code in the kernel 2.4 and 2.6. Please
consider to apply them respectively.

Thanks,

Wensong

[-- Attachment #2: Type: TEXT/PLAIN, Size: 1444 bytes --]

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1333  -> 1.1334 
#	net/ipv4/ipvs/ip_vs_ctl.c	1.4     -> 1.5    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/03/09	wensong@linux-vs.org	1.1334
# [IPVS] code tidy up
# 
# Patch from Horms <horms@vergenet.net>
# 
# 1. The trailing '\n' was missing, it has been added
# 2. The protocol is already in host byte order,
#    the ntohl() call has been removed
# --------------------------------------------
#
diff -Nru a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c
--- a/net/ipv4/ipvs/ip_vs_ctl.c	Tue Mar  9 00:03:29 2004
+++ b/net/ipv4/ipvs/ip_vs_ctl.c	Tue Mar  9 00:03:29 2004
@@ -1737,9 +1737,9 @@
 	 * Check for valid protocol: TCP or UDP. Even for fwmark!=0
 	 */
 	if (urule->protocol!=IPPROTO_TCP && urule->protocol!=IPPROTO_UDP) {
-		IP_VS_INFO("vs_ctl: invalid protocol: %d %d.%d.%d.%d:%d %s",
-			   ntohs(urule->protocol), NIPQUAD(urule->vaddr),
-			   ntohs(urule->vport), urule->sched_name);
+		IP_VS_ERR("set_ctl: invalid protocol %d %d.%d.%d.%d:%d %s\n",
+			  urule->protocol, NIPQUAD(urule->vaddr),
+			  ntohs(urule->vport), urule->sched_name);
 		ret = -EFAULT;
 		goto out_unlock;
 	}

[-- Attachment #3: Type: TEXT/PLAIN, Size: 1430 bytes --]

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1692  -> 1.1693 
#	net/ipv4/ipvs/ip_vs_ctl.c	1.12    -> 1.13   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/03/09	wensong@linux-vs.org	1.1693
# [IPVS] code tidy up
# 
# Patch from Horms <horms@vergenet.net>
# 
# 1. The trailing '\n' was missing, it has been added
# 2. The protocol is already in host byte order,
#    the ntohl() call has been removed
# --------------------------------------------
#
diff -Nru a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c
--- a/net/ipv4/ipvs/ip_vs_ctl.c	Tue Mar  9 00:36:29 2004
+++ b/net/ipv4/ipvs/ip_vs_ctl.c	Tue Mar  9 00:36:29 2004
@@ -1836,9 +1836,9 @@
 
 	/* Check for valid protocol: TCP or UDP, even for fwmark!=0 */
 	if (usvc->protocol!=IPPROTO_TCP && usvc->protocol!=IPPROTO_UDP) {
-		IP_VS_INFO("vs_ctl: invalid protocol: %d %d.%d.%d.%d:%d %s",
-			   ntohs(usvc->protocol), NIPQUAD(usvc->addr),
-			   ntohs(usvc->port), usvc->sched_name);
+		IP_VS_ERR("set_ctl: invalid protocol: %d %d.%d.%d.%d:%d %s\n",
+			  usvc->protocol, NIPQUAD(usvc->addr),
+			  ntohs(usvc->port), usvc->sched_name);
 		ret = -EFAULT;
 		goto out_unlock;
 	}

Re: [PATCH 2.4/2.6] IPVS: code tidy up

[David S. Miller]

On Tue, 9 Mar 2004 00:37:54 +0800 (CST)
Wensong Zhang <wensong@linux-vs.org> wrote:

> Here are the minor patches for IPVS code in the kernel 2.4 and 2.6. Please
> consider to apply them respectively.

I'll apply this stuff, thanks guys.