diff options
| author | David Ahern <dsahern@gmail.com> | 2019-04-23 17:23:41 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-24 04:42:29 +0200 |
| commit | ffa8ce54be3aaf6b15abae3bbd08282b867d3a4f (patch) | |
| tree | 73a06ba0a651afeb65f19a4ee93e296e45bfe849 /net/ipv4 | |
| parent | ravb: Avoid unsupported internal delay mode for R-Car E3/D3 (diff) | |
| download | linux-ffa8ce54be3aaf6b15abae3bbd08282b867d3a4f.tar.xz linux-ffa8ce54be3aaf6b15abae3bbd08282b867d3a4f.zip | |
lwtunnel: Pass encap and encap type attributes to lwtunnel_fill_encap
Currently, lwtunnel_fill_encap hardcodes the encap and encap type
attributes as RTA_ENCAP and RTA_ENCAP_TYPE, respectively. The nexthop
objects want to re-use this code but the encap attributes passed to
userspace as NHA_ENCAP and NHA_ENCAP_TYPE. Since that is the only
difference, change lwtunnel_fill_encap to take the attribute type as
an input.
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/fib_semantics.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index b5230c4a1c16..c695e629fac2 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -1503,7 +1503,8 @@ int fib_nexthop_info(struct sk_buff *skb, const struct fib_nh_common *nhc, goto nla_put_failure; if (nhc->nhc_lwtstate && - lwtunnel_fill_encap(skb, nhc->nhc_lwtstate) < 0) + lwtunnel_fill_encap(skb, nhc->nhc_lwtstate, + RTA_ENCAP, RTA_ENCAP_TYPE) < 0) goto nla_put_failure; return 0; |