projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[linux-2.6-block.git]
/
net
/
ipv4
/
ip_tunnel_core.c
diff --git
a/net/ipv4/ip_tunnel_core.c
b/net/ipv4/ip_tunnel_core.c
index c857ec6b97848abca5bcbd93b45cc15a97ef48ab..9a0e67b52a4eec8875bb0ba557c84d67a9588123 100644
(file)
--- 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;