From eddd51daab1e21948f67d8da7b1ee09af1d92387 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 21 Jul 2008 18:45:34 -0700
Subject: [PATCH] --- yaml --- r: 104878 b: refs/heads/master c:
 b32d13102d39ed411d152a7ffcc5f66d5b3b1b49 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f923447b0c15..13ea4d826cb9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebb36a978131810c98e7198b1187090c697cf99f
+refs/heads/master: b32d13102d39ed411d152a7ffcc5f66d5b3b1b49
diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c
index 1fa683c0ba9b..a00532de2a8c 100644
--- a/trunk/net/ipv4/tcp_output.c
+++ b/trunk/net/ipv4/tcp_output.c
@@ -472,7 +472,7 @@ static unsigned tcp_syn_options(struct sock *sk, struct sk_buff *skb,
 	}
 	if (likely(sysctl_tcp_sack)) {
 		opts->options |= OPTION_SACK_ADVERTISE;
-		if (unlikely(!OPTION_TS & opts->options))
+		if (unlikely(!(OPTION_TS & opts->options)))
 			size += TCPOLEN_SACKPERM_ALIGNED;
 	}