Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

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 <spathi@codeaurora.org>
This commit is contained in:
Lorenzo Colitti 2017-06-27 15:08:52 +09:00 committed by syphyr
parent 454fd4e57c
commit 1b498ef3d6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv4/ip_vti.c
View File

@ -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;