shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

net/ipv6: fix a merge conflict

Browse Source 
Change-Id: I05840f8be0301d073965e4e8c6c12c5bf9c2c5ad
This commit is contained in:
Mauro (mdrjr) Ribeiro
2019-08-29 18:32:34 -03:00
parent a2b1640891
commit 0bdda8a264
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv6/ip6_tunnel.c
View File

@@ -1362,11 +1362,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
fl6.flowi6_mark = skb->mark;
}
<<<<<<< HEAD
fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL);
=======
dsfield = INET_ECN_encapsulate(dsfield, ipv6_get_dsfield(ipv6h));
>>>>>>> 5c6502c4a18b17712f530e6702ffed0c3dff75af
if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
return -1;