| Message ID | 20191113113358.4740-1-steffen.klassert@secunet.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | pull request (net-next): ipsec-next 2019-11-13 | expand |
From: Steffen Klassert <steffen.klassert@secunet.com> Date: Wed, 13 Nov 2019 12:33:56 +0100 > 1) Remove a unnecessary net_exit function from the xfrm interface. > From Xin Long. > > 2) Assign xfrm4_udp_encap_rcv to a UDP socket only if xfrm > is configured. From Alexey Dobriyan. > > Please pull or let me know if there are problems. Also pulled, thanks.
1) Remove a unnecessary net_exit function from the xfrm interface. From Xin Long. 2) Assign xfrm4_udp_encap_rcv to a UDP socket only if xfrm is configured. From Alexey Dobriyan. Please pull or let me know if there are problems. Thanks! The following changes since commit 02dc96ef6c25f990452c114c59d75c368a1f4c8f: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2019-09-28 17:47:33 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git master for you to fetch changes up to fd1ac07f3f17fbbc2f08e3b43951bed937d86a7b: xfrm: ifdef setsockopt(UDP_ENCAP_ESPINUDP/UDP_ENCAP_ESPINUDP_NON_IKE) (2019-10-09 06:55:32 +0200) ---------------------------------------------------------------- Alexey Dobriyan (1): xfrm: ifdef setsockopt(UDP_ENCAP_ESPINUDP/UDP_ENCAP_ESPINUDP_NON_IKE) Xin Long (1): xfrm: remove the unnecessary .net_exit for xfrmi include/net/xfrm.h | 7 ------- net/ipv4/udp.c | 2 ++ net/xfrm/xfrm_interface.c | 23 ----------------------- 3 files changed, 2 insertions(+), 30 deletions(-)