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

Commit f0bd3f65 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "net: ipv6: add fib6_nh_release_dsts stub" 



This reverts commit cca61bb1 which is
commit 8837cbbf854246f5f4d565f21e6baa945d37aded upstream.

It breaks the abi and is not needed for Android systems, so it can be
safely reverted.

Bug: 161946584
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I25198224e60cb4de5c9e5186331c78e2e4c9c28c
parent e9602557

include/net/ip6_fib.h

+0 −1
Original line number Diff line number Diff line
@@ -451,7 +451,6 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, 
		 struct fib6_config *cfg, gfp_t gfp_flags,

		 struct netlink_ext_ack *extack);

void fib6_nh_release(struct fib6_nh *fib6_nh);

void fib6_nh_release_dsts(struct fib6_nh *fib6_nh);



int call_fib6_entry_notifiers(struct net *net,

			      enum fib_event_type event_type,

include/net/ipv6_stubs.h

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 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_nh_release_dsts)(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 (*fib6_rt_update)(struct net *net, struct fib6_info *rt,

net/ipv6/af_inet6.c

+0 −1
Original line number Diff line number Diff line
@@ -957,7 +957,6 @@ 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_nh_release_dsts = fib6_nh_release_dsts,

	.fib6_update_sernum = fib6_update_sernum_stub,

	.fib6_rt_update	   = fib6_rt_update,

	.ip6_del_rt	   = ip6_del_rt,

net/ipv6/route.c

+0 −19
Original line number Diff line number Diff line
@@ -3585,25 +3585,6 @@ void fib6_nh_release(struct fib6_nh *fib6_nh) 
	fib_nh_common_release(&fib6_nh->nh_common);

}



void fib6_nh_release_dsts(struct fib6_nh *fib6_nh)

{

	int cpu;



	if (!fib6_nh->rt6i_pcpu)

		return;



	for_each_possible_cpu(cpu) {

		struct rt6_info *pcpu_rt, **ppcpu_rt;



		ppcpu_rt = per_cpu_ptr(fib6_nh->rt6i_pcpu, cpu);

		pcpu_rt = xchg(ppcpu_rt, NULL);

		if (pcpu_rt) {

			dst_dev_put(&pcpu_rt->dst);

			dst_release(&pcpu_rt->dst);

		}

	}

}



static struct fib6_info *ip6_route_info_create(struct fib6_config *cfg,

					      gfp_t gfp_flags,

					      struct netlink_ext_ack *extack)