Commit 03ba6dc0 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Paolo Abeni
Browse files

net: dst: Make dst_destroy() static and return void. 



Since commit 52df157f ("xfrm: take refcnt of dst when creating
struct xfrm_dst bundle") dst_destroy() returns only NULL and no caller
cares about the return value.
There are no in in-tree users of dst_destroy() outside of the file.

Make dst_destroy() static and return void.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20240202163746.2489150-1-bigeasy@linutronix.de


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent ead21932

include/net/dst.h

+0 −1
Original line number Diff line number Diff line
@@ -390,7 +390,6 @@ void *dst_alloc(struct dst_ops *ops, struct net_device *dev, 
void dst_init(struct dst_entry *dst, struct dst_ops *ops,

	      struct net_device *dev, int initial_obsolete,

	      unsigned short flags);

struct dst_entry *dst_destroy(struct dst_entry *dst);

void dst_dev_put(struct dst_entry *dst);



static inline void dst_confirm(struct dst_entry *dst)

net/core/dst.c

+2 −4
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ void *dst_alloc(struct dst_ops *ops, struct net_device *dev, 
}

EXPORT_SYMBOL(dst_alloc);



struct dst_entry *dst_destroy(struct dst_entry * dst)

static void dst_destroy(struct dst_entry *dst)

{

	struct dst_entry *child = NULL;
@@ -126,15 +126,13 @@ struct dst_entry *dst_destroy(struct dst_entry * dst) 
	dst = child;

	if (dst)

		dst_release_immediate(dst);

	return NULL;

}

EXPORT_SYMBOL(dst_destroy);



static void dst_destroy_rcu(struct rcu_head *head)

{

	struct dst_entry *dst = container_of(head, struct dst_entry, rcu_head);



	dst = dst_destroy(dst);

	dst_destroy(dst);

}



/* Operations to mark dst as DEAD and clean up the net device referenced