---

yaml --- r: 211103 b: refs/heads/master c: 94e2238 h: refs/heads/master i: 211101: d59cb7f 211099: 27fb517 211095: a4dbd72 211087: 20700c0 211071: 9e808b6 v: v3
git-mirror · Sep 23, 2010 · fb54a8b · fb54a8b
1 parent b38f5a9
commit fb54a8b
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: 3f5a2a713aad28480d86b0add00c68484b54febc
+refs/heads/master: 94e2238969e89f5112297ad2a00103089dde7e8f
diff --git 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,