From fb54a8bd72e61604d34f291ebcf8de7eb8211d79 Mon Sep 17 00:00:00 2001
From: Ulrich Weber <uweber@astaro.com>
Date: Wed, 22 Sep 2010 06:45:11 +0000
Subject: [PATCH] --- yaml --- r: 211103 b: refs/heads/master c:
 94e2238969e89f5112297ad2a00103089dde7e8f h: refs/heads/master i:   211101:
 d59cb7ff987e360d336ca4c9b620146de206d5b4   211099:
 27fb517f4fff38ed4b7e210445922edff44d751a   211095:
 a4dbd72a1191c6d975fb5735afcca49c19fa1fac   211087:
 20700c0721133fcd9d3b58ea95e04172c059fd40   211071:
 9e808b63a7137c6a887e94b6d18c83950c69b149 v: v3

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

diff --git a/[refs] b/[refs]
index 8b81bb590526..45b35ce6e7d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f5a2a713aad28480d86b0add00c68484b54febc
+refs/heads/master: 94e2238969e89f5112297ad2a00103089dde7e8f
diff --git a/trunk/net/ipv4/xfrm4_policy.c b/trunk/net/ipv4/xfrm4_policy.c
index 869078d4eeb9..a580349f0b8a 100644
--- a/trunk/net/ipv4/xfrm4_policy.c
+++ b/trunk/net/ipv4/xfrm4_policy.c
@@ -61,7 +61,7 @@ static int xfrm4_get_saddr(struct net *net,
 
 static int xfrm4_get_tos(struct flowi *fl)
 {
-	return fl->fl4_tos;
+	return IPTOS_RT_MASK & fl->fl4_tos; /* Strip ECN bits */
 }
 
 static int xfrm4_init_path(struct xfrm_dst *path, struct dst_entry *dst,