Skip to content
Snippets Groups Projects
Commit 5be68afa authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Make the VTI code compile.

This was broken by the backport of the UID routing code.

Test: all_tests.sh passes
Change-Id: I98c7a75fbf3ca55cc57c87c0b9d9810b3bd451d3
(cherry picked from commit 9253e8d2e1f9d54c4116b0652cc84cfe413ac92e)
parent 2fa0be5d
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment