diff options
| author |   David Ahern <dsahern@gmail.com> | 2019-04-23 08:23:41 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-04-23 19:42:29 -0700 |
| commit | ffa8ce54be3aaf6b15abae3bbd08282b867d3a4f (patch) | |
| tree | 73a06ba0a651afeb65f19a4ee93e296e45bfe849 /include | |
| parent | ravb: Avoid unsupported internal delay mode for R-Car E3/D3 (diff) | |
| download | linux-dev-ffa8ce54be3aaf6b15abae3bbd08282b867d3a4f.tar.xz linux-dev-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 'include')
| -rw-r--r-- | include/net/lwtunnel.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/net/lwtunnel.h b/include/net/lwtunnel.h index 671113bcb2cc..5d6c5b1fc695 100644 --- a/include/net/lwtunnel.h +++ b/include/net/lwtunnel.h @@ -118,8 +118,8 @@ int lwtunnel_build_state(u16 encap_type, unsigned int family, const void *cfg, struct lwtunnel_state **lws, struct netlink_ext_ack *extack); -int lwtunnel_fill_encap(struct sk_buff *skb, - struct lwtunnel_state *lwtstate); +int lwtunnel_fill_encap(struct sk_buff *skb, struct lwtunnel_state *lwtstate, + int encap_attr, int encap_type_attr); int lwtunnel_get_encap_size(struct lwtunnel_state *lwtstate); struct lwtunnel_state *lwtunnel_state_alloc(int hdr_len); int lwtunnel_cmp_encap(struct lwtunnel_state *a, struct lwtunnel_state *b); @@ -219,7 +219,8 @@ static inline int lwtunnel_build_state(u16 encap_type, } static inline int lwtunnel_fill_encap(struct sk_buff *skb, - struct lwtunnel_state *lwtstate) + struct lwtunnel_state *lwtstate, + int encap_attr, int encap_type_attr) { return 0; } |