Merge branch 'acpica' into release

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / xfrm4_policy.c

diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index 23883a48ebfb37e0fa5b210d9207e8ba5c12b733..a580349f0b8ab53c77b04b00d504de0bf1f83e09 100644 (file)
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -37,7 +37,7 @@ static struct dst_entry *xfrm4_dst_lookup(struct net *net, int tos,
                fl.fl4_src = saddr->a4;
 
        err = __ip_route_output_key(net, &rt, &fl);
-       dst = &rt->u.dst;
+       dst = &rt->dst;
        if (err)
                dst = ERR_PTR(err);
        return dst;
@@ -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,