diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-23 14:50:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-23 14:50:06 +0100 |
| commit | 63ffd29793580ce1b3e66f2d0278153ec680c323 (patch) | |
| tree | 4e4015d50031f9afc74e3867d1a5c13e1975ca46 /net/ipv4/ipip.c | |
| parent | cbb9335c899458fba61392e28c22e12470de1e50 (diff) | |
| parent | 1df10cef2d1e7f9f2fb7eddb67fc70d3abf101f9 (diff) | |
| download | linux-next-63ffd29793580ce1b3e66f2d0278153ec680c323.tar.gz linux-next-63ffd29793580ce1b3e66f2d0278153ec680c323.zip | |
Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
# Conflicts:
# MAINTAINERS
# drivers/net/amt.c
Diffstat (limited to 'net/ipv4/ipip.c')
| -rw-r--r-- | net/ipv4/ipip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index b643194f57d2..d1aa048a6099 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -360,8 +360,9 @@ static int ipip_fill_forward_path(struct net_device_path_ctx *ctx, const struct iphdr *tiph = &tunnel->parms.iph; struct rtable *rt; - rt = ip_route_output(dev_net(ctx->dev), tiph->daddr, 0, 0, 0, - RT_SCOPE_UNIVERSE); + rt = ip_route_output(dev_net(ctx->dev), tiph->daddr, tiph->saddr, + inet_dsfield_to_dscp(tiph->tos), + tunnel->parms.link, RT_SCOPE_UNIVERSE); if (IS_ERR(rt)) return PTR_ERR(rt); |