p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
David Ahern 2019-04-23 08:23:41 -07:00 committed by David S. Miller
parent 0a5d329ffd
commit ffa8ce54be
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/net/lwtunnel.h
View File

@ -118,8 +118,8 @@ int lwtunnel_build_state(u16 encap_type,
unsigned int family, const void *cfg, unsigned int family, const void *cfg,
struct lwtunnel_state **lws, struct lwtunnel_state **lws,
struct netlink_ext_ack *extack); struct netlink_ext_ack *extack);
int lwtunnel_fill_encap(struct sk_buff *skb, int lwtunnel_fill_encap(struct sk_buff *skb, struct lwtunnel_state *lwtstate,
struct lwtunnel_state *lwtstate); int encap_attr, int encap_type_attr);
int lwtunnel_get_encap_size(struct lwtunnel_state *lwtstate); int lwtunnel_get_encap_size(struct lwtunnel_state *lwtstate);
struct lwtunnel_state *lwtunnel_state_alloc(int hdr_len); struct lwtunnel_state *lwtunnel_state_alloc(int hdr_len);
int lwtunnel_cmp_encap(struct lwtunnel_state *a, struct lwtunnel_state *b); 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, 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; return 0;
} }

7
net/core/lwtunnel.c
View File

@ -223,7 +223,8 @@ void lwtstate_free(struct lwtunnel_state *lws)
} }
EXPORT_SYMBOL_GPL(lwtstate_free); EXPORT_SYMBOL_GPL(lwtstate_free);
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)
{ {
const struct lwtunnel_encap_ops *ops; const struct lwtunnel_encap_ops *ops;
struct nlattr *nest; struct nlattr *nest;
@ -236,7 +237,7 @@ int lwtunnel_fill_encap(struct sk_buff *skb, struct lwtunnel_state *lwtstate)
lwtstate->type > LWTUNNEL_ENCAP_MAX) lwtstate->type > LWTUNNEL_ENCAP_MAX)
return 0; return 0;
nest = nla_nest_start(skb, RTA_ENCAP); nest = nla_nest_start(skb, encap_attr);
if (!nest) if (!nest)
return -EMSGSIZE; return -EMSGSIZE;
@ -250,7 +251,7 @@ int lwtunnel_fill_encap(struct sk_buff *skb, struct lwtunnel_state *lwtstate)
if (ret) if (ret)
goto nla_put_failure; goto nla_put_failure;
nla_nest_end(skb, nest); nla_nest_end(skb, nest);
ret = nla_put_u16(skb, RTA_ENCAP_TYPE, lwtstate->type); ret = nla_put_u16(skb, encap_type_attr, lwtstate->type);
if (ret) if (ret)
goto nla_put_failure; goto nla_put_failure;

3
net/ipv4/fib_semantics.c
View File

@ -1503,7 +1503,8 @@ int fib_nexthop_info(struct sk_buff *skb, const struct fib_nh_common *nhc,
goto nla_put_failure; goto nla_put_failure;
if (nhc->nhc_lwtstate && 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; goto nla_put_failure;
return 0; return 0;