Commit 560e08ed authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

net: ax25: remove route refcount 



Nothing takes the refcount since v4.9.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b0fdcdc

include/net/ax25.h

+0 −12
Original line number Diff line number Diff line
@@ -187,18 +187,12 @@ typedef struct { 


typedef struct ax25_route {

	struct ax25_route	*next;

	refcount_t		refcount;

	ax25_address		callsign;

	struct net_device	*dev;

	ax25_digi		*digipeat;

	char			ip_mode;

} ax25_route;



static inline void ax25_hold_route(ax25_route *ax25_rt)

{

	refcount_inc(&ax25_rt->refcount);

}



void __ax25_put_route(ax25_route *ax25_rt);



extern rwlock_t ax25_route_lock;
@@ -213,12 +207,6 @@ static inline void ax25_route_lock_unuse(void) 
	read_unlock(&ax25_route_lock);

}



static inline void ax25_put_route(ax25_route *ax25_rt)

{

	if (refcount_dec_and_test(&ax25_rt->refcount))

		__ax25_put_route(ax25_rt);

}



typedef struct {

	char			slave;			/* slave_mode?   */

	struct timer_list	slave_timer;		/* timeout timer */

net/ax25/ax25_route.c

+2 −3
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ static int __must_check ax25_rt_add(struct ax25_routes_struct *route) 
		return -ENOMEM;

	}



	refcount_set(&ax25_rt->refcount, 1);

	ax25_rt->callsign     = route->dest_addr;

	ax25_rt->dev          = ax25_dev->dev;

	ax25_rt->digipeat     = NULL;
@@ -160,12 +159,12 @@ static int ax25_rt_del(struct ax25_routes_struct *route) 
		    ax25cmp(&route->dest_addr, &s->callsign) == 0) {

			if (ax25_route_list == s) {

				ax25_route_list = s->next;

				ax25_put_route(s);

				__ax25_put_route(s);

			} else {

				for (t = ax25_route_list; t != NULL; t = t->next) {

					if (t->next == s) {

						t->next = s->next;

						ax25_put_route(s);

						__ax25_put_route(s);

						break;

					}

				}