From 1b498ef3d672c64d23607cadcd7d4c7bbd9421d8 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Tue, 27 Jun 2017 15:08:52 +0900 Subject: [PATCH] Make the VTI code compile. This was broken by the backport of the UID routing code. Test: run_net_test.sh all_tests.sh compiles Change-Id: I98c7a75fbf3ca55cc57c87c0b9d9810b3bd451d3 Git-commit: 9253e8d2e1f9d54c4116b0652cc84cfe413ac92e Git-repo: https://android.googlesource.com/kernel/common.git Signed-off-by: Srinivasarao P --- net/ipv4/ip_vti.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index eadafac6f461..5b0a9f07b97f 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -338,7 +338,8 @@ static netdev_tx_t vti_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) be32_to_cpu(tunnel->parms.o_key), RT_TOS(tos), RT_SCOPE_UNIVERSE, IPPROTO_IPIP, 0, - dst, tiph->saddr, 0, 0); + dst, tiph->saddr, 0, 0, + sock_net_uid(dev_net(dev), NULL)); rt = ip_route_output_key(dev_net(dev), &fl4); if (IS_ERR(rt)) { dev->stats.tx_carrier_errors++; @@ -405,7 +406,8 @@ static int vti_tunnel_bind_dev(struct net_device *dev) be32_to_cpu(tunnel->parms.i_key), RT_TOS(iph->tos), RT_SCOPE_UNIVERSE, IPPROTO_IPIP, 0, - iph->daddr, iph->saddr, 0, 0); + iph->daddr, iph->saddr, 0, 0, + sock_net_uid(dev_net(dev), NULL)); rt = ip_route_output_key(dev_net(dev), &fl4); if (!IS_ERR(rt)) { tdev = rt->dst.dev;