diff options
| author | David S. Miller <davem@davemloft.net> | 2018-12-24 16:19:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-24 16:19:56 -0800 |
| commit | 90cadbbf341dd5b2df991c33a6bd6341f3a53788 (patch) | |
| tree | 306a7e88725865b7310fa5b0962336f98a8214fe /net/ipv4 | |
| parent | c92c81df93df95dafbf6926613ce0b436227b007 (diff) | |
| parent | 38355a5f9a22bfa5bd5b1bb79805aca39fa53729 (diff) | |
| download | talos-obmc-linux-90cadbbf341dd5b2df991c33a6bd6341f3a53788.tar.gz talos-obmc-linux-90cadbbf341dd5b2df991c33a6bd6341f3a53788.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull in bug fixes before respinning my net-next pull
request.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_tunnel_core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c index c857ec6b9784..9a0e67b52a4e 100644 --- a/net/ipv4/ip_tunnel_core.c +++ b/net/ipv4/ip_tunnel_core.c @@ -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; |
