Commit 11dd74b3 authored by Roopa Prabhu's avatar Roopa Prabhu Committed by David S. Miller
Browse files

net: ipv6: new arg skip_notify to ip6_rt_del 



Used in subsequent work to skip route delete
notifications on nexthop deletes.

Suggested-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2ac757e4

include/net/ip6_route.h

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ int ipv6_route_ioctl(struct net *net, unsigned int cmd, void __user *arg); 
int ip6_route_add(struct fib6_config *cfg, gfp_t gfp_flags,

		  struct netlink_ext_ack *extack);

int ip6_ins_rt(struct net *net, struct fib6_info *f6i);

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

int ip6_del_rt(struct net *net, struct fib6_info *f6i, bool skip_notify);



void rt6_flush_exceptions(struct fib6_info *f6i);

void rt6_age_exceptions(struct fib6_info *f6i, struct fib6_gc_args *gc_args,

include/net/ipv6_stubs.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct ipv6_stub { 
			    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);

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

	void (*fib6_rt_update)(struct net *net, struct fib6_info *rt,

			       struct nl_info *info);

net/ipv4/nexthop.c

+1 −1
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ static void __remove_nexthop_fib(struct net *net, struct nexthop *nh) 
	list_for_each_entry_safe(f6i, tmp, &nh->f6i_list, nh_list) {

		/* __ip6_del_rt does a release, so do a hold here */

		fib6_info_hold(f6i);

		ipv6_stub->ip6_del_rt(net, f6i);

		ipv6_stub->ip6_del_rt(net, f6i, false);

	}

}

net/ipv6/addrconf.c

+6 −6
Original line number Diff line number Diff line
@@ -1238,7 +1238,7 @@ cleanup_prefix_route(struct inet6_ifaddr *ifp, unsigned long expires, 
					ifp->idev->dev, 0, RTF_DEFAULT, true);

	if (f6i) {

		if (del_rt)

			ip6_del_rt(dev_net(ifp->idev->dev), f6i);

			ip6_del_rt(dev_net(ifp->idev->dev), f6i, false);

		else {

			if (!(f6i->fib6_flags & RTF_EXPIRES))

				fib6_set_expires(f6i, expires);
@@ -2718,7 +2718,7 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao) 
		if (rt) {

			/* Autoconf prefix route */

			if (valid_lft == 0) {

				ip6_del_rt(net, rt);

				ip6_del_rt(net, rt, false);

				rt = NULL;

			} else if (addrconf_finite_timeout(rt_expires)) {

				/* not infinity */
@@ -3813,7 +3813,7 @@ static int addrconf_ifdown(struct net_device *dev, int how) 
		spin_unlock_bh(&ifa->lock);



		if (rt)

			ip6_del_rt(net, rt);

			ip6_del_rt(net, rt, false);



		if (state != INET6_IFADDR_STATE_DEAD) {

			__ipv6_ifa_notify(RTM_DELADDR, ifa);
@@ -4652,7 +4652,7 @@ static int modify_prefix_route(struct inet6_ifaddr *ifp, 
	prio = ifp->rt_priority ? : IP6_RT_PRIO_ADDRCONF;

	if (f6i->fib6_metric != prio) {

		/* delete old one */

		ip6_del_rt(dev_net(ifp->idev->dev), f6i);

		ip6_del_rt(dev_net(ifp->idev->dev), f6i, false);



		/* add new one */

		addrconf_prefix_route(modify_peer ? &ifp->peer_addr : &ifp->addr,
@@ -6073,10 +6073,10 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp) 
						       ifp->idev->dev, 0, 0,

						       false);

			if (rt)

				ip6_del_rt(net, rt);

				ip6_del_rt(net, rt, false);

		}

		if (ifp->rt) {

			ip6_del_rt(net, ifp->rt);

			ip6_del_rt(net, ifp->rt, false);

			ifp->rt = NULL;

		}

		rt_genid_bump_ipv6(net);

net/ipv6/addrconf_core.c

+2 −1
Original line number Diff line number Diff line
@@ -185,7 +185,8 @@ static int eafnosupport_fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, 
	return -EAFNOSUPPORT;

}



static int eafnosupport_ip6_del_rt(struct net *net, struct fib6_info *rt)

static int eafnosupport_ip6_del_rt(struct net *net, struct fib6_info *rt,

				   bool skip_notify)

{

	return -EAFNOSUPPORT;

}