Commit d2944b1c authored by David Howells's avatar David Howells
Browse files

rxrpc: Use rxrpc_free_skb() rather than rxrpc_lose_skb() 



rxrpc_lose_skb() is now exactly the same as rxrpc_free_skb(), so remove it
and use the latter instead.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 6f41617b

net/rxrpc/ar-internal.h

+0 −1
Original line number Diff line number Diff line
@@ -1095,7 +1095,6 @@ void rxrpc_new_skb(struct sk_buff *, enum rxrpc_skb_trace); 
void rxrpc_see_skb(struct sk_buff *, enum rxrpc_skb_trace);

void rxrpc_get_skb(struct sk_buff *, enum rxrpc_skb_trace);

void rxrpc_free_skb(struct sk_buff *, enum rxrpc_skb_trace);

void rxrpc_lose_skb(struct sk_buff *, enum rxrpc_skb_trace);

void rxrpc_purge_queue(struct sk_buff_head *);



/*

net/rxrpc/input.c

+1 −1
Original line number Diff line number Diff line
@@ -1176,7 +1176,7 @@ void rxrpc_data_ready(struct sock *udp_sk) 
		static int lose;

		if ((lose++ & 7) == 7) {

			trace_rxrpc_rx_lose(sp);

			rxrpc_lose_skb(skb, rxrpc_skb_rx_lost);

			rxrpc_free_skb(skb, rxrpc_skb_rx_lost);

			return;

		}

	}

net/rxrpc/skbuff.c

+0 −15
Original line number Diff line number Diff line
@@ -68,21 +68,6 @@ void rxrpc_free_skb(struct sk_buff *skb, enum rxrpc_skb_trace op) 
	}

}



/*

 * Note the injected loss of a socket buffer.

 */

void rxrpc_lose_skb(struct sk_buff *skb, enum rxrpc_skb_trace op)

{

	const void *here = __builtin_return_address(0);

	if (skb) {

		int n;

		CHECK_SLAB_OKAY(&skb->users);

		n = atomic_dec_return(select_skb_count(op));

		trace_rxrpc_skb(skb, op, refcount_read(&skb->users), n, here);

		kfree_skb(skb);

	}

}



/*

 * Clear a queue of socket buffers.

 */