summaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorTom Herbert <tom@herbertland.com>2015-08-24 09:45:41 -0700
committerDavid S. Miller <davem@davemloft.net>2015-08-24 10:34:40 -0700
commit127eb7cd3c210afead788991a30950a9e36759ea (patch)
tree8bb513d62040ed1017bb11922a38792f93b7fd33 /net/ipv6
parent54cf7be992fe86571a3f07b96446cd5334b014ab (diff)
downloadlinux-127eb7cd3c210afead788991a30950a9e36759ea.tar.gz
linux-127eb7cd3c210afead788991a30950a9e36759ea.tar.bz2
linux-127eb7cd3c210afead788991a30950a9e36759ea.zip
lwt: Add cfg argument to build_state
Add cfg and family arguments to lwt build state functions. cfg is a void pointer and will either be a pointer to a fib_config or fib6_config structure. The family parameter indicates which one (either AF_INET or AF_INET6). LWT encpasulation implementation may use the fib configuration to build the LWT state. Signed-off-by: Tom Herbert <tom@herbertland.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/ila.c1
-rw-r--r--net/ipv6/route.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv6/ila.c b/net/ipv6/ila.c
index f011c3d5ca40..ffe4dcad6088 100644
--- a/net/ipv6/ila.c
+++ b/net/ipv6/ila.c
@@ -123,6 +123,7 @@ static struct nla_policy ila_nl_policy[ILA_ATTR_MAX + 1] = {
};
static int ila_build_state(struct net_device *dev, struct nlattr *nla,
+ unsigned int family, const void *cfg,
struct lwtunnel_state **ts)
{
struct ila_params *p;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index e476f01add87..df3e353a012d 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1819,7 +1819,8 @@ int ip6_route_add(struct fib6_config *cfg)
struct lwtunnel_state *lwtstate;
err = lwtunnel_build_state(dev, cfg->fc_encap_type,
- cfg->fc_encap, &lwtstate);
+ cfg->fc_encap, AF_INET6, cfg,
+ &lwtstate);
if (err)
goto out;
rt->dst.lwtstate = lwtstate_get(lwtstate);