Commit faee6769 authored by Alexander Aring's avatar Alexander Aring Committed by David S. Miller
Browse files

net: add net available in build_state 



The build_state callback of lwtunnel doesn't contain the net namespace
structure yet. This patch will add it so we can check on specific
address configuration at creation time of rpl source routes.

Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8610c7c6

include/net/ip_fib.h

+3 −2
Original line number Diff line number Diff line
@@ -470,8 +470,9 @@ int fib_nh_init(struct net *net, struct fib_nh *fib_nh, 
		struct fib_config *cfg, int nh_weight,

		struct netlink_ext_ack *extack);

void fib_nh_release(struct net *net, struct fib_nh *fib_nh);

int fib_nh_common_init(struct fib_nh_common *nhc, struct nlattr *fc_encap,

		       u16 fc_encap_type, void *cfg, gfp_t gfp_flags,

int fib_nh_common_init(struct net *net, struct fib_nh_common *nhc,

		       struct nlattr *fc_encap, u16 fc_encap_type,

		       void *cfg, gfp_t gfp_flags,

		       struct netlink_ext_ack *extack);

void fib_nh_common_release(struct fib_nh_common *nhc);

include/net/lwtunnel.h

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct lwtunnel_state { 
};



struct lwtunnel_encap_ops {

	int (*build_state)(struct nlattr *encap,

	int (*build_state)(struct net *net, struct nlattr *encap,

			   unsigned int family, const void *cfg,

			   struct lwtunnel_state **ts,

			   struct netlink_ext_ack *extack);
@@ -113,7 +113,7 @@ int lwtunnel_valid_encap_type(u16 encap_type, 
			      struct netlink_ext_ack *extack);

int lwtunnel_valid_encap_type_attr(struct nlattr *attr, int len,

				   struct netlink_ext_ack *extack);

int lwtunnel_build_state(u16 encap_type,

int lwtunnel_build_state(struct net *net, u16 encap_type,

			 struct nlattr *encap,

			 unsigned int family, const void *cfg,

			 struct lwtunnel_state **lws,
@@ -209,7 +209,7 @@ static inline int lwtunnel_valid_encap_type_attr(struct nlattr *attr, int len, 
	return 0;

}



static inline int lwtunnel_build_state(u16 encap_type,

static inline int lwtunnel_build_state(struct net *net, u16 encap_type,

				       struct nlattr *encap,

				       unsigned int family, const void *cfg,

				       struct lwtunnel_state **lws,

net/core/lwt_bpf.c

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static const struct nla_policy bpf_nl_policy[LWT_BPF_MAX + 1] = { 
	[LWT_BPF_XMIT_HEADROOM]	= { .type = NLA_U32 },

};



static int bpf_build_state(struct nlattr *nla,

static int bpf_build_state(struct net *net, struct nlattr *nla,

			   unsigned int family, const void *cfg,

			   struct lwtunnel_state **ts,

			   struct netlink_ext_ack *extack)

net/core/lwtunnel.c

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ int lwtunnel_encap_del_ops(const struct lwtunnel_encap_ops *ops, 
}

EXPORT_SYMBOL_GPL(lwtunnel_encap_del_ops);



int lwtunnel_build_state(u16 encap_type,

int lwtunnel_build_state(struct net *net, u16 encap_type,

			 struct nlattr *encap, unsigned int family,

			 const void *cfg, struct lwtunnel_state **lws,

			 struct netlink_ext_ack *extack)
@@ -122,7 +122,7 @@ int lwtunnel_build_state(u16 encap_type, 
	rcu_read_unlock();



	if (found) {

		ret = ops->build_state(encap, family, cfg, lws, extack);

		ret = ops->build_state(net, encap, family, cfg, lws, extack);

		if (ret)

			module_put(ops->owner);

	} else {

net/ipv4/fib_lookup.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static inline void fib_alias_accessed(struct fib_alias *fa) 
void fib_release_info(struct fib_info *);

struct fib_info *fib_create_info(struct fib_config *cfg,

				 struct netlink_ext_ack *extack);

int fib_nh_match(struct fib_config *cfg, struct fib_info *fi,

int fib_nh_match(struct net *net, struct fib_config *cfg, struct fib_info *fi,

		 struct netlink_ext_ack *extack);

bool fib_metrics_match(struct fib_config *cfg, struct fib_info *fi);

int fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event,

CRA Git | Maintained and supported by SUSTech CRA and CCSE