From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 3 Nov 2022 18:38:42 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fbeb229a6622523c092a13c02bd0e15f69240dde;p=linux.git

Merge git://git./linux/kernel/git/netdev/net

No conflicts.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

fbeb229a6622523c092a13c02bd0e15f69240dde
diff --cc net/ipv6/udp.c
index 297f7cc060444,bc65e5b7195b3..10f45658dbf67
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@@ -64,8 -64,9 +64,9 @@@ static void udpv6_destruct_sock(struct 
  
  int udpv6_init_sock(struct sock *sk)
  {
 -	skb_queue_head_init(&udp_sk(sk)->reader_queue);
 +	udp_lib_init_sock(sk);
  	sk->sk_destruct = udpv6_destruct_sock;
+ 	set_bit(SOCK_SUPPORT_ZC, &sk->sk_socket->flags);
  	return 0;
  }