Messages in this thread Patch in this message | | | Date | Fri, 19 Nov 2010 13:56:38 -0800 | From | Greg KH <> | Subject | [77/82] xfrm4: strip ECN bits from tos field |
| |
2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Ulrich Weber <uweber@astaro.com>
[ Upstream commit 94e2238969e89f5112297ad2a00103089dde7e8f ]
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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- net/ipv4/xfrm4_policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/ipv4/xfrm4_policy.c +++ b/net/ipv4/xfrm4_policy.c @@ -61,7 +61,7 @@ static int xfrm4_get_saddr(struct net *n 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,
| |