diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-03 22:26:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-03 22:26:14 -0700 |
| commit | c961b1ccd0f258bdee808c61c2c2a0907a1fffda (patch) | |
| tree | b4d102911e7e8af04d0f94df4dc734a331260fb7 | |
| parent | 58da018053531b9cb91423a64f2a762ef0fe7456 (diff) | |
| parent | 0335f5b500adcc28bc3fd5d8a1e4482c348cff4a (diff) | |
| download | linux-c961b1ccd0f258bdee808c61c2c2a0907a1fffda.tar.bz2 | |
Merge branch 'lwtunnel-encap-local'
Robert Shearman says:
====================
lwtunnel: encap locally-generated ipv4 packets
Locally-generated IPv4 packets, such as from applications running on
the host or traceroute/ping currently don't have lwtunnel output
redirected encap applied. However, they should do in the same way as
for forwarded packets and this patch series addresses that.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/lwtunnel.c | 12 | ||||
| -rw-r--r-- | net/ipv4/route.c | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/net/core/lwtunnel.c b/net/core/lwtunnel.c index c240c895b319..5d6d8e3d450a 100644 --- a/net/core/lwtunnel.c +++ b/net/core/lwtunnel.c @@ -215,8 +215,12 @@ int lwtunnel_output6(struct sock *sk, struct sk_buff *skb) struct rt6_info *rt = (struct rt6_info *)skb_dst(skb); struct lwtunnel_state *lwtstate = NULL; - if (rt) + if (rt) { lwtstate = rt->rt6i_lwtstate; + skb->dev = rt->dst.dev; + } + + skb->protocol = htons(ETH_P_IPV6); return __lwtunnel_output(sk, skb, lwtstate); } @@ -227,8 +231,12 @@ int lwtunnel_output(struct sock *sk, struct sk_buff *skb) struct rtable *rt = (struct rtable *)skb_dst(skb); struct lwtunnel_state *lwtstate = NULL; - if (rt) + if (rt) { lwtstate = rt->rt_lwtstate; + skb->dev = rt->dst.dev; + } + + skb->protocol = htons(ETH_P_IP); return __lwtunnel_output(sk, skb, lwtstate); } diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 908f7ef2f12a..18fd7c9095c7 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -2022,6 +2022,8 @@ add: } rt_set_nexthop(rth, fl4->daddr, res, fnhe, fi, type, 0); + if (lwtunnel_output_redirect(rth->rt_lwtstate)) + rth->dst.output = lwtunnel_output; return rth; } |