From: David S. Miller <davem@davemloft.net>
Date: Mon, 1 Jun 2020 00:48:46 +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=1806c13dc2532090d742ce03847b22367fb20ad6;p=linux.git

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

xdp_umem.c had overlapping changes between the 64-bit math fix
for the calculation of npgs and the removal of the zerocopy
memory type which got rid of the chunk_size_nohdr member.

The mlx5 Kconfig conflict is a case where we just take the
net-next copy of the Kconfig entry dependency as it takes on
the ESWITCH dependency by one level of indirection which is
what the 'net' conflicting change is trying to ensure.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

1806c13dc2532090d742ce03847b22367fb20ad6
diff --cc net/mptcp/protocol.c
index b2c8b57e7942a,34dd0e278a829..14b253d10ccfe
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@@ -1710,20 -1649,17 +1733,10 @@@ bool mptcp_finish_join(struct sock *sk
  	parent_sock = READ_ONCE(parent->sk_socket);
  	if (parent_sock && !sk->sk_socket)
  		mptcp_sock_graft(sk, parent_sock);
- 
- 	ret = mptcp_pm_allow_new_subflow(msk);
- 	if (ret) {
- 		subflow->map_seq = msk->ack_seq;
- 
- 		/* active connections are already on conn_list */
- 		spin_lock_bh(&msk->join_list_lock);
- 		if (!WARN_ON_ONCE(!list_empty(&subflow->node)))
- 			list_add_tail(&subflow->node, &msk->join_list);
- 		spin_unlock_bh(&msk->join_list_lock);
- 	}
- 	return ret;
+ 	subflow->map_seq = msk->ack_seq;
+ 	return true;
  }
  
 -bool mptcp_sk_is_subflow(const struct sock *sk)
 -{
 -	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
 -
 -	return subflow->mp_join == 1;
 -}
 -
  static bool mptcp_memory_free(const struct sock *sk, int wake)
  {
  	struct mptcp_sock *msk = mptcp_sk(sk);
diff --cc net/xdp/xdp_umem.c
index 19e59d1a5e9f7,3889bd9aec466..1bbaf1747e4f9
--- a/net/xdp/xdp_umem.c
+++ b/net/xdp/xdp_umem.c
@@@ -349,10 -389,13 +353,10 @@@ static int xdp_umem_reg(struct xdp_ume
  	if (headroom >= chunk_size - XDP_PACKET_HEADROOM)
  		return -EINVAL;
  
 -	umem->address = (unsigned long)addr;
 -	umem->chunk_mask = unaligned_chunks ? XSK_UNALIGNED_BUF_ADDR_MASK
 -					    : ~((u64)chunk_size - 1);
  	umem->size = size;
  	umem->headroom = headroom;
 -	umem->chunk_size_nohr = chunk_size - headroom;
 +	umem->chunk_size = chunk_size;
- 	umem->npgs = size / PAGE_SIZE;
+ 	umem->npgs = (u32)npgs;
  	umem->pgs = NULL;
  	umem->user = NULL;
  	umem->flags = mr->flags;
diff --cc net/xfrm/espintcp.c
index 2132a3b6df0fc,5a0ff665b71a8..100e29682b481
--- a/net/xfrm/espintcp.c
+++ b/net/xfrm/espintcp.c
@@@ -430,21 -416,11 +431,22 @@@ static int espintcp_init_sk(struct soc
  	strp_check_rcv(&ctx->strp);
  	skb_queue_head_init(&ctx->ike_queue);
  	skb_queue_head_init(&ctx->out_queue);
 -	sk->sk_prot = &espintcp_prot;
 -	sk->sk_socket->ops = &espintcp_ops;
 +
 +	if (sk->sk_family == AF_INET) {
 +		sk->sk_prot = &espintcp_prot;
 +		sk->sk_socket->ops = &espintcp_ops;
 +	} else {
 +		mutex_lock(&tcpv6_prot_mutex);
 +		if (!espintcp6_prot.recvmsg)
 +			build_protos(&espintcp6_prot, &espintcp6_ops, sk->sk_prot, sk->sk_socket->ops);
 +		mutex_unlock(&tcpv6_prot_mutex);
 +
 +		sk->sk_prot = &espintcp6_prot;
 +		sk->sk_socket->ops = &espintcp6_ops;
 +	}
  	ctx->saved_data_ready = sk->sk_data_ready;
  	ctx->saved_write_space = sk->sk_write_space;
+ 	ctx->saved_destruct = sk->sk_destruct;
  	sk->sk_data_ready = espintcp_data_ready;
  	sk->sk_write_space = espintcp_write_space;
  	sk->sk_destruct = espintcp_destruct;