summaryrefslogtreecommitdiffstats
path: root/include/net/ip_tunnels.h
diff options
context:
space:
mode:
authorDmitry Popov <ixaphire@qrator.net>2014-07-29 03:07:52 +0400
committerDavid S. Miller <davem@davemloft.net>2014-07-30 15:18:58 -0700
commit95cb5745983c222867cc9ac593aebb2ad67d72c0 (patch)
treeaea09d3b5173d5365eb42cdb2dd11eee831062c6 /include/net/ip_tunnels.h
parentdabf24d168ae7da5c3dc8c383db64b200e9ab483 (diff)
downloadop-kernel-dev-95cb5745983c222867cc9ac593aebb2ad67d72c0.zip
op-kernel-dev-95cb5745983c222867cc9ac593aebb2ad67d72c0.tar.gz
ip_tunnel(ipv4): fix tunnels with "local any remote $remote_ip"
Ipv4 tunnels created with "local any remote $ip" didn't work properly since 7d442fab0 (ipv4: Cache dst in tunnels). 99% of packets sent via those tunnels had src addr = 0.0.0.0. That was because only dst_entry was cached, although fl4.saddr has to be cached too. Every time ip_tunnel_xmit used cached dst_entry (tunnel_rtable_get returned non-NULL), fl4.saddr was initialized with tnl_params->saddr (= 0 in our case), and wasn't changed until iptunnel_xmit(). This patch adds saddr to ip_tunnel->dst_cache, fixing this issue. Reported-by: Sergey Popov <pinkbyte@gentoo.org> Signed-off-by: Dmitry Popov <ixaphire@qrator.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ip_tunnels.h')
-rw-r--r--include/net/ip_tunnels.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
index a4daf9e..8dd8cab 100644
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@ -40,6 +40,7 @@ struct ip_tunnel_prl_entry {
struct ip_tunnel_dst {
struct dst_entry __rcu *dst;
+ __be32 saddr;
};
struct ip_tunnel {
OpenPOWER on IntegriCloud