From 066dbc55464b2b5bcf7602cedf764410dc747a46 Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Sat, 22 Mar 2008 16:35:00 -0700
Subject: [PATCH] --- yaml --- r: 90201 b: refs/heads/master c:
 10fe7d85e2e4042f703a10bed4123f2105eadad2 h: refs/heads/master i:   90199:
 e26bc40bbe9b2fcffd0ff77e7f1cbf1289942b8c v: v3

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

diff --git a/[refs] b/[refs]
index d909613a5dd9..32fade2b8d37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec3c0982a2dd1e671bad8e9d26c28dcba0039d87
+refs/heads/master: 10fe7d85e2e4042f703a10bed4123f2105eadad2
diff --git a/trunk/net/ipv4/ip_options.c b/trunk/net/ipv4/ip_options.c
index df93a9c2efda..7e94bf850a07 100644
--- a/trunk/net/ipv4/ip_options.c
+++ b/trunk/net/ipv4/ip_options.c
@@ -267,8 +267,7 @@ int ip_options_compile(struct ip_options * opt, struct sk_buff * skb)
 		optptr = iph + sizeof(struct iphdr);
 		opt->is_data = 0;
 	} else {
-		optptr = opt->is_data ? opt->__data :
-					(unsigned char *)&(ip_hdr(skb)[1]);
+		optptr = opt->__data;
 		iph = optptr - sizeof(struct iphdr);
 	}