From 9ce4489c14b725ed0bf0a02d8a75f2ef975d6235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Sat, 22 Oct 2011 00:07:47 -0400
Subject: [PATCH] --- yaml --- r: 266913 b: refs/heads/master c:
 2c67e9acb65da96ae1b0ba93ec04af7142533bef h: refs/heads/master i:   266911:
 e926f25048304a7836e1a7bb784900215e1871b7 v: v3

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

diff --git a/[refs] b/[refs]
index 3753a2ea1881..505e4b300391 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf533ea53ebfae41be15b103d78e7ebec30b9969
+refs/heads/master: 2c67e9acb65da96ae1b0ba93ec04af7142533bef
diff --git a/trunk/net/ipv4/ip_sockglue.c b/trunk/net/ipv4/ip_sockglue.c
index f0dc3ad662ae..09ff51bf16a4 100644
--- a/trunk/net/ipv4/ip_sockglue.c
+++ b/trunk/net/ipv4/ip_sockglue.c
@@ -33,6 +33,7 @@
 #include <linux/netfilter.h>
 #include <linux/route.h>
 #include <linux/mroute.h>
+#include <net/inet_ecn.h>
 #include <net/route.h>
 #include <net/xfrm.h>
 #include <net/compat.h>
@@ -578,8 +579,8 @@ static int do_ip_setsockopt(struct sock *sk, int level,
 		break;
 	case IP_TOS:	/* This sets both TOS and Precedence */
 		if (sk->sk_type == SOCK_STREAM) {
-			val &= ~3;
-			val |= inet->tos & 3;
+			val &= ~INET_ECN_MASK;
+			val |= inet->tos & INET_ECN_MASK;
 		}
 		if (inet->tos != val) {
 			inet->tos = val;