From: Jakub Kicinski <kuba@kernel.org>
Date: Mon, 24 Oct 2022 20:44:11 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.6.17~5932^2~382
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=96917bb3a377e1ed103fd5c420a95e5fb25ca104;p=platform%2Fkernel%2Flinux-rpi.git

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

include/linux/net.h
  a5ef058dc4d9 ("net: introduce and use custom sockopt socket flag")
  e993ffe3da4b ("net: flag sockets supporting msghdr originated zerocopy")

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

96917bb3a377e1ed103fd5c420a95e5fb25ca104
diff --cc drivers/net/ethernet/freescale/fman/mac.h
index 5bf03e1,13b69ca..ad06f8d7
--- a/drivers/net/ethernet/freescale/fman/mac.h
+++ b/drivers/net/ethernet/freescale/fman/mac.h
@@@ -21,14 -20,21 +21,14 @@@ struct mac_priv_s
  
  struct mac_device {
  	void __iomem		*vaddr;
- 	void __iomem		*vaddr_end;
  	struct device		*dev;
+ 	struct resource		*res;
  	u8			 addr[ETH_ALEN];
  	struct fman_port	*port[2];
 -	u32			 if_support;
 -	struct phy_device	*phy_dev;
 +	struct phylink		*phylink;
 +	struct phylink_config	phylink_config;
  	phy_interface_t		phy_if;
 -	struct device_node	*phy_node;
 -	struct net_device	*net_dev;
  
 -	bool autoneg_pause;
 -	bool rx_pause_req;
 -	bool tx_pause_req;
 -	bool rx_pause_active;
 -	bool tx_pause_active;
  	bool promisc;
  	bool allmulti;
  
diff --cc include/linux/net.h
index 59350fd,18d942b..b73ad8e
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@@ -41,7 -41,7 +41,8 @@@ struct net
  #define SOCK_NOSPACE		2
  #define SOCK_PASSCRED		3
  #define SOCK_PASSSEC		4
- #define SOCK_CUSTOM_SOCKOPT	5
+ #define SOCK_SUPPORT_ZC		5
++#define SOCK_CUSTOM_SOCKOPT	6
  
  #ifndef ARCH_HAS_SOCKET_TYPES
  /**
diff --cc net/ipv4/udp.c
index e77c8f0,6a320a6..89accc3
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@@ -1622,8 -1622,9 +1622,9 @@@ static void udp_destruct_sock(struct so
  
  int udp_init_sock(struct sock *sk)
  {
 -	skb_queue_head_init(&udp_sk(sk)->reader_queue);
 +	udp_lib_init_sock(sk);
  	sk->sk_destruct = udp_destruct_sock;
+ 	set_bit(SOCK_SUPPORT_ZC, &sk->sk_socket->flags);
  	return 0;
  }