[kernel] r11412 - in dists/sid/linux-2.6/debian: . patches/bugfix/all/stable patches/series

[Bastian Blank]

Author: waldi
Date: Sat May 17 08:51:31 2008
New Revision: 11412

Log:
Workaround one ABI change.

* linux-2.6/debian/changelog: Update.
* linux-2.6/debian/patches/bugfix/all/stable/2.6.25.4-abi-1.patch: Add.
* linux-2.6/debian/patches/series/4: Add new patch.


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.25.4-abi-1.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/4

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sat May 17 08:51:31 2008
@@ -1,5 +1,6 @@
 linux-2.6 (2.6.25-4) UNRELEASED; urgency=low
 
+  [ maximilian attems ]
   * Fix arm Kconfig logic disabling random drivers. (closes: #481410)
   * Add stable release 2.6.25.4:
     - OHCI: fix regression upon awakening from hibernation
@@ -42,6 +43,9 @@
     - XFRM: AUDIT: Fix flowlabel text format ambibuity.
   * Update userspace merged HZ alpha fixed version.
  
+  [ Bastian Blank ]
+  * Fix ABI changes from: ipvs: fix oops in backup for fwmark conn templates
+
  -- maximilian attems <maks at debian.org>  Fri, 16 May 2008 00:16:56 +0200
 
 linux-2.6 (2.6.25-3) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.25.4-abi-1.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.25.4-abi-1.patch	Sat May 17 08:51:31 2008
@@ -0,0 +1,80 @@
+diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
+index 9a51eba..56f3c94 100644
+--- a/include/net/ip_vs.h
++++ b/include/net/ip_vs.h
+@@ -405,8 +405,7 @@ struct sk_buff;
+ struct ip_vs_protocol {
+ 	struct ip_vs_protocol	*next;
+ 	char			*name;
+-	u16			protocol;
+-	u16			num_states;
++	__u16			protocol;
+ 	int			dont_defrag;
+ 	atomic_t		appcnt;		/* counter of proto app incs */
+ 	int			*timeout_table;	/* protocol timeout table */
+diff --git a/net/ipv4/ipvs/ip_vs_proto_ah.c b/net/ipv4/ipvs/ip_vs_proto_ah.c
+index 4bf835e..a842676 100644
+--- a/net/ipv4/ipvs/ip_vs_proto_ah.c
++++ b/net/ipv4/ipvs/ip_vs_proto_ah.c
+@@ -160,7 +160,6 @@ static void ah_exit(struct ip_vs_protocol *pp)
+ struct ip_vs_protocol ip_vs_protocol_ah = {
+ 	.name =			"AH",
+ 	.protocol =		IPPROTO_AH,
+-	.num_states =		1,
+ 	.dont_defrag =		1,
+ 	.init =			ah_init,
+ 	.exit =			ah_exit,
+diff --git a/net/ipv4/ipvs/ip_vs_proto_esp.c b/net/ipv4/ipvs/ip_vs_proto_esp.c
+index db6a6b7..aef0d3e 100644
+--- a/net/ipv4/ipvs/ip_vs_proto_esp.c
++++ b/net/ipv4/ipvs/ip_vs_proto_esp.c
+@@ -159,7 +159,6 @@ static void esp_exit(struct ip_vs_protocol *pp)
+ struct ip_vs_protocol ip_vs_protocol_esp = {
+ 	.name =			"ESP",
+ 	.protocol =		IPPROTO_ESP,
+-	.num_states =		1,
+ 	.dont_defrag =		1,
+ 	.init =			esp_init,
+ 	.exit =			esp_exit,
+diff --git a/net/ipv4/ipvs/ip_vs_proto_tcp.c b/net/ipv4/ipvs/ip_vs_proto_tcp.c
+index 480f876..12dc0d6 100644
+--- a/net/ipv4/ipvs/ip_vs_proto_tcp.c
++++ b/net/ipv4/ipvs/ip_vs_proto_tcp.c
+@@ -594,7 +594,6 @@ static void ip_vs_tcp_exit(struct ip_vs_protocol *pp)
+ struct ip_vs_protocol ip_vs_protocol_tcp = {
+ 	.name =			"TCP",
+ 	.protocol =		IPPROTO_TCP,
+-	.num_states =		IP_VS_TCP_S_LAST,
+ 	.dont_defrag =		0,
+ 	.appcnt =		ATOMIC_INIT(0),
+ 	.init =			ip_vs_tcp_init,
+diff --git a/net/ipv4/ipvs/ip_vs_proto_udp.c b/net/ipv4/ipvs/ip_vs_proto_udp.c
+index 8e3b059..1fa7b33 100644
+--- a/net/ipv4/ipvs/ip_vs_proto_udp.c
++++ b/net/ipv4/ipvs/ip_vs_proto_udp.c
+@@ -409,7 +409,6 @@ static void udp_exit(struct ip_vs_protocol *pp)
+ struct ip_vs_protocol ip_vs_protocol_udp = {
+ 	.name =			"UDP",
+ 	.protocol =		IPPROTO_UDP,
+-	.num_states =		IP_VS_UDP_S_LAST,
+ 	.dont_defrag =		0,
+ 	.init =			udp_init,
+ 	.exit =			udp_exit,
+diff --git a/net/ipv4/ipvs/ip_vs_sync.c b/net/ipv4/ipvs/ip_vs_sync.c
+index a392d6e..78de383 100644
+--- a/net/ipv4/ipvs/ip_vs_sync.c
++++ b/net/ipv4/ipvs/ip_vs_sync.c
+@@ -339,7 +339,12 @@ static void ip_vs_process_message(const char *buffer, const size_t buflen)
+ 					s->protocol);
+ 				continue;
+ 			}
+-			if (state >= pp->num_states) {
++			u16 num_states = 1;
++			if (pp->protocol == IPPROTO_TCP)
++				num_states = IP_VS_TCP_S_LAST;
++			else if (pp->protocol == IPPROTO_UDP)
++				num_states = IP_VS_UDP_S_LAST;
++			if (state >= num_states) {
+ 				IP_VS_DBG(2, "Invalid %s state %u in sync msg\n",
+ 					pp->name, state);
+ 				continue;

Modified: dists/sid/linux-2.6/debian/patches/series/4
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/4	(original)
+++ dists/sid/linux-2.6/debian/patches/series/4	Sat May 17 08:51:31 2008
@@ -1,3 +1,4 @@
 + bugfix/all/stable/2.6.25.4.patch
 - bugfix/all/unbreak-HZ-userspace.patch
 + bugfix/all/unbreak-HZ-userspace-2.patch
++ bugfix/all/stable/2.6.25.4-abi-1.patch