Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: Drop unused @sk of __skb_try_recv_from_queue()

__skb_try_recv_from_queue() deals with a queue, @sk is not used
since commit e427cad6eee4 ("net: datagram: drop 'destructor'
argument from several helpers"). Remove sk from function parameters,
adapt callers.

No functional change intended.

Signed-off-by: Michal Luczaj <mhal@rbox.co>
Reviewed-by: Joe Damato <jdamato@fastly.com>
Link: https://patch.msgid.link/20250407-cleanup-drop-param-sk-v1-1-cd076979afac@rbox.co
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Michal Luczaj and committed by
Jakub Kicinski
420aabef 6a0f72c5

+7 -9
+1 -2
include/linux/skbuff.h
··· 4105 4105 int __skb_wait_for_more_packets(struct sock *sk, struct sk_buff_head *queue, 4106 4106 int *err, long *timeo_p, 4107 4107 const struct sk_buff *skb); 4108 - struct sk_buff *__skb_try_recv_from_queue(struct sock *sk, 4109 - struct sk_buff_head *queue, 4108 + struct sk_buff *__skb_try_recv_from_queue(struct sk_buff_head *queue, 4110 4109 unsigned int flags, 4111 4110 int *off, int *err, 4112 4111 struct sk_buff **last);
+2 -3
net/core/datagram.c
··· 163 163 return skb; 164 164 } 165 165 166 - struct sk_buff *__skb_try_recv_from_queue(struct sock *sk, 167 - struct sk_buff_head *queue, 166 + struct sk_buff *__skb_try_recv_from_queue(struct sk_buff_head *queue, 168 167 unsigned int flags, 169 168 int *off, int *err, 170 169 struct sk_buff **last) ··· 260 261 * However, this function was correct in any case. 8) 261 262 */ 262 263 spin_lock_irqsave(&queue->lock, cpu_flags); 263 - skb = __skb_try_recv_from_queue(sk, queue, flags, off, &error, 264 + skb = __skb_try_recv_from_queue(queue, flags, off, &error, 264 265 last); 265 266 spin_unlock_irqrestore(&queue->lock, cpu_flags); 266 267 if (error)
+4 -4
net/ipv4/udp.c
··· 1942 1942 error = -EAGAIN; 1943 1943 do { 1944 1944 spin_lock_bh(&queue->lock); 1945 - skb = __skb_try_recv_from_queue(sk, queue, flags, off, 1946 - err, &last); 1945 + skb = __skb_try_recv_from_queue(queue, flags, off, err, 1946 + &last); 1947 1947 if (skb) { 1948 1948 if (!(flags & MSG_PEEK)) 1949 1949 udp_skb_destructor(sk, skb); ··· 1964 1964 spin_lock(&sk_queue->lock); 1965 1965 skb_queue_splice_tail_init(sk_queue, queue); 1966 1966 1967 - skb = __skb_try_recv_from_queue(sk, queue, flags, off, 1968 - err, &last); 1967 + skb = __skb_try_recv_from_queue(queue, flags, off, err, 1968 + &last); 1969 1969 if (skb && !(flags & MSG_PEEK)) 1970 1970 udp_skb_dtor_locked(sk, skb); 1971 1971 spin_unlock(&sk_queue->lock);