Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdaa16a4 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

ipv6: Add hook to bump sernum for a route to stubs 



Add hook to ipv6 stub to bump the sernum up to the root node for a
route. This is needed by the nexthop code when a nexthop config changes.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 68a9b13d

include/net/ip6_fib.h

+1 −0
Original line number Diff line number Diff line
@@ -485,6 +485,7 @@ int fib6_tables_dump(struct net *net, struct notifier_block *nb); 


void fib6_update_sernum(struct net *net, struct fib6_info *rt);

void fib6_update_sernum_upto_root(struct net *net, struct fib6_info *rt);

void fib6_update_sernum_stub(struct net *net, struct fib6_info *f6i);



void fib6_metric_set(struct fib6_info *f6i, int metric, u32 val);

static inline bool fib6_metric_locked(struct fib6_info *f6i, int metric)

include/net/ipv6_stubs.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ struct ipv6_stub { 
			    struct fib6_config *cfg, gfp_t gfp_flags,

			    struct netlink_ext_ack *extack);

	void (*fib6_nh_release)(struct fib6_nh *fib6_nh);

	void (*fib6_update_sernum)(struct net *net, struct fib6_info *rt);

	int (*ip6_del_rt)(struct net *net, struct fib6_info *rt);

	void (*udpv6_encap_enable)(void);

	void (*ndisc_send_na)(struct net_device *dev, const struct in6_addr *daddr,

net/ipv6/af_inet6.c

+1 −0
Original line number Diff line number Diff line
@@ -926,6 +926,7 @@ static const struct ipv6_stub ipv6_stub_impl = { 
	.ip6_mtu_from_fib6 = ip6_mtu_from_fib6,

	.fib6_nh_init	   = fib6_nh_init,

	.fib6_nh_release   = fib6_nh_release,

	.fib6_update_sernum = fib6_update_sernum_stub,

	.ip6_del_rt	   = ip6_del_rt,

	.udpv6_encap_enable = udpv6_encap_enable,

	.ndisc_send_na = ndisc_send_na,

net/ipv6/ip6_fib.c

+8 −0
Original line number Diff line number Diff line
@@ -1222,6 +1222,14 @@ void fib6_update_sernum_upto_root(struct net *net, struct fib6_info *rt) 
	__fib6_update_sernum_upto_root(rt, fib6_new_sernum(net));

}



/* allow ipv4 to update sernum via ipv6_stub */

void fib6_update_sernum_stub(struct net *net, struct fib6_info *f6i)

{

	spin_lock_bh(&f6i->fib6_table->tb6_lock);

	fib6_update_sernum_upto_root(net, f6i);

	spin_unlock_bh(&f6i->fib6_table->tb6_lock);

}



/*

 *	Add routing information to the routing tree.

 *	<destination addr>/<source addr>