---

yaml --- r: 90201 b: refs/heads/master c: 10fe7d8 h: refs/heads/master i: 90199: e26bc40 v: v3
git-mirror · Mar 22, 2008 · 066dbc5 · 066dbc5
1 parent 3709465
commit 066dbc5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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);
 	}