---

yaml --- r: 361053 b: refs/heads/master c: fa2b04f h: refs/heads/master i: 361051: 6e00a12 v: v3
git-mirror · Mar 6, 2013 · 4ca208d · 4ca208d
1 parent 7f96f10
commit 4ca208d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1f41b67ff7735193bc8b418b98ac99a448833e2
+refs/heads/master: fa2b04f4502d74659e4e4b1294c6d88e08ece032
diff --git a/trunk/net/ipv4/ip_options.c b/trunk/net/ipv4/ip_options.c
@@ -423,7 +423,7 @@ int ip_options_compile(struct net *net,
 					put_unaligned_be32(midtime, timeptr);
 					opt->is_changed = 1;
 				}
-			} else {
+			} else if ((optptr[3]&0xF) != IPOPT_TS_PRESPEC) {
 				unsigned int overflow = optptr[3]>>4;
 				if (overflow == 15) {
 					pp_ptr = optptr + 3;