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

Commit 274f482d authored by Sorin Dumitru's avatar Sorin Dumitru Committed by David S. Miller
Browse files

sock: remove skb argument from sk_rcvqueues_full 



It hasn't been used since commit 0fd7bac6(net: relax rcvbuf limits).

Signed-off-by: default avatarSorin Dumitru <sorin@returnze.ro>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 52c4f0ec

include/net/sock.h

+2 −3
Original line number Diff line number Diff line
@@ -810,8 +810,7 @@ static inline void __sk_add_backlog(struct sock *sk, struct sk_buff *skb) 
 * Do not take into account this skb truesize,

 * to allow even a single big packet to come.

 */

static inline bool sk_rcvqueues_full(const struct sock *sk, const struct sk_buff *skb,

				     unsigned int limit)

static inline bool sk_rcvqueues_full(const struct sock *sk, unsigned int limit)

{

	unsigned int qsize = sk->sk_backlog.len + atomic_read(&sk->sk_rmem_alloc);
@@ -822,7 +821,7 @@ static inline bool sk_rcvqueues_full(const struct sock *sk, const struct sk_buff 
static inline __must_check int sk_add_backlog(struct sock *sk, struct sk_buff *skb,

					      unsigned int limit)

{

	if (sk_rcvqueues_full(sk, skb, limit))

	if (sk_rcvqueues_full(sk, limit))

		return -ENOBUFS;



	__sk_add_backlog(sk, skb);

net/core/sock.c

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested) 


	skb->dev = NULL;



	if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) {

	if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {

		atomic_inc(&sk->sk_drops);

		goto discard_and_relse;

	}

net/ipv4/udp.c

+1 −1
Original line number Diff line number Diff line
@@ -1567,7 +1567,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 
		goto csum_error;





	if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) {

	if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {

		UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,

				 is_udplite);

		goto drop;

net/ipv6/udp.c

+1 −1
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 
			goto csum_error;

	}



	if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) {

	if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {

		UDP6_INC_STATS_BH(sock_net(sk),

				  UDP_MIB_RCVBUFERRORS, is_udplite);

		goto drop;