From 4ca208db28bdf80bf013c47765283f70006e4e22 Mon Sep 17 00:00:00 2001
From: David Ward <david.ward@ll.mit.edu>
Date: Tue, 5 Mar 2013 17:06:32 +0000
Subject: [PATCH] --- yaml --- r: 361053 b: refs/heads/master c:
 fa2b04f4502d74659e4e4b1294c6d88e08ece032 h: refs/heads/master i:   361051:
 6e00a12e3e960ebefe2568078fb858ff1d0bc7df 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 ceccad9e092b..e50b07f0941a 100644
--- 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
index f6289bf6f332..310a3647c83d 100644
--- 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;