]> git.baikalelectronics.ru Git - kernel.git/commitdiff
xfrm4: strip ECN bits from tos field
authorUlrich Weber <uweber@astaro.com>
Wed, 22 Sep 2010 06:45:11 +0000 (06:45 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 23 Sep 2010 03:25:48 +0000 (20:25 -0700)
otherwise ECT(1) bit will get interpreted as RTO_ONLINK
and routing will fail with XfrmOutBundleGenError.

Signed-off-by: Ulrich Weber <uweber@astaro.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/xfrm4_policy.c

index 869078d4eeb957a4982ab62e5d408e8fbf42117c..a580349f0b8ab53c77b04b00d504de0bf1f83e09 100644 (file)
@@ -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,