From 706943299fffc39ca5bc13e314a5b91f4df182e3 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <weiyj@soft.fujitsu.com>
Date: Tue, 9 May 2006 15:18:50 -0700
Subject: [PATCH] --- yaml --- r: 26633 b: refs/heads/master c:
 63cbd2fda38f3d1f107c4fd6261e5660be3eccf9 h: refs/heads/master i:   26631:
 5c6ed4345080ed2a102226cef60733f84866c777 v: v3

---
 [refs]                      | 2 +-
 trunk/net/ipv4/ip_options.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 830f2c6c9d1c..dac0aba66add 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a01c1ef75e1d84752ddef607c389bbde9c2576e
+refs/heads/master: 63cbd2fda38f3d1f107c4fd6261e5660be3eccf9
diff --git a/trunk/net/ipv4/ip_options.c b/trunk/net/ipv4/ip_options.c
index 9bebad07bf2e..cbcae6544622 100644
--- a/trunk/net/ipv4/ip_options.c
+++ b/trunk/net/ipv4/ip_options.c
@@ -209,7 +209,7 @@ int ip_options_echo(struct ip_options * dopt, struct sk_buff * skb)
 
 void ip_options_fragment(struct sk_buff * skb) 
 {
-	unsigned char * optptr = skb->nh.raw;
+	unsigned char * optptr = skb->nh.raw + sizeof(struct iphdr);
 	struct ip_options * opt = &(IPCB(skb)->opt);
 	int  l = opt->optlen;
 	int  optlen;