# 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.1337  -> 1.1338 
#	net/ipv4/ipvs/ip_vs_conn.c	1.4     -> 1.5    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/03/22	ja@xxxxxx	1.1338
# [IPVS] Fix to update the skb->h.raw after skb reallocation in tunnel_xmit
# --------------------------------------------
#
diff -Nru a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c
--- a/net/ipv4/ipvs/ip_vs_conn.c	Mon Mar 22 23:30:53 2004
+++ b/net/ipv4/ipvs/ip_vs_conn.c	Mon Mar 22 23:30:53 2004
@@ -892,8 +892,6 @@
 	/* update checksum because skb might be defragmented */
 	ip_send_check(old_iph);
 
-	skb->h.raw = skb->nh.raw;
-
 	/*
 	 * Okay, now see if we can stuff it in the buffer as-is.
 	 */
@@ -913,6 +911,7 @@
 		old_iph = skb->nh.iph;
 	}
 
+	skb->h.raw = skb->nh.raw;
 	skb->nh.raw = skb_push(skb, sizeof(struct iphdr));
 	memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));