On 11/18/20 8:14 AM, Oliver Herms wrote:
> This patch adds an IPv6 routes encapsulation attribute
> to the result of netlink RTM_GETROUTE requests
> (i.e. ip route get 2001:db8::).
>
> Signed-off-by: Oliver Herms <oliver.peter.he...@gmail.com>
> ---
> net/ipv6/route.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/net/ipv6/route.c b/net/ipv6/route.c
> index 7e0ce7af8234..64bda402357b 100644
> --- a/net/ipv6/route.c
> +++ b/net/ipv6/route.c
> @@ -5558,6 +5558,10 @@ static int rt6_fill_node(struct net *net, struct
> sk_buff *skb,
>
> if (dst->dev && nla_put_u32(skb, RTA_OIF, dst->dev->ifindex))
> goto nla_put_failure;
> +
> + if (dst && dst->lwtstate &&
> + lwtunnel_fill_encap(skb, dst->lwtstate, RTA_ENCAP,
> RTA_ENCAP_TYPE) < 0)
> + goto nla_put_failure;
> } else if (rt->fib6_nsiblings) {
> struct fib6_info *sibling, *next_sibling;
> struct nlattr *mp;
>
You forgot to remove the dst part of that. rt6 == dst so to be in this
branch dst != NULL.
Besides that nit that maybe Jakub will fixup before applying:
Reviewed-by: David Ahern <dsah...@kernel.org>
