A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse source 
Pull in bug fixes before respinning my net-next pull
request.

Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
David S. Miller 2018-12-24 16:19:56 -08:00
commit 90cadbbf34
6 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
net/ipv4/ip_tunnel_core.c
View file

@ -151,6 +151,7 @@ struct metadata_dst *iptunnel_metadata_reply(struct metadata_dst *md,
sizeof(struct in6_addr));
else
dst->key.u.ipv4.dst = src->key.u.ipv4.src;
dst->key.tun_flags = src->key.tun_flags;
dst->mode = src->mode | IP_TUNNEL_INFO_TX;
return res;