From: David S. Miller <davem@davemloft.net>
Date: Fri, 28 Feb 2020 02:31:39 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9f6e055907362f6692185c1c9658295d24095c74;p=linux.git

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

The mptcp conflict was overlapping additions.

The SMC conflict was an additional and removal happening at the same
time.

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

9f6e055907362f6692185c1c9658295d24095c74
diff --cc drivers/net/ethernet/mellanox/mlxsw/pci_hw.h
index ea7ec9dc637bf,43fa8c85b5d9f..32c7cabfb2615
--- a/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h
@@@ -25,8 -25,10 +25,8 @@@
  #define MLXSW_PCI_CIR_CTRL_STATUS_SHIFT		24
  #define MLXSW_PCI_CIR_TIMEOUT_MSECS		1000
  
 -#define MLXSW_PCI_SW_RESET			0xF0010
 -#define MLXSW_PCI_SW_RESET_RST_BIT		BIT(0)
  #define MLXSW_PCI_SW_RESET_TIMEOUT_MSECS	900000
- #define MLXSW_PCI_SW_RESET_WAIT_MSECS		100
+ #define MLXSW_PCI_SW_RESET_WAIT_MSECS		200
  #define MLXSW_PCI_FW_READY			0xA1844
  #define MLXSW_PCI_FW_READY_MASK			0xFFFF
  #define MLXSW_PCI_FW_READY_MAGIC		0x5E
diff --cc net/mptcp/protocol.c
index 044295707bbf9,3c19a8efdcead..a8445407d25ad
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@@ -666,26 -543,20 +666,32 @@@ static void __mptcp_close_ssk(struct so
  	}
  }
  
+ static unsigned int mptcp_sync_mss(struct sock *sk, u32 pmtu)
+ {
+ 	return 0;
+ }
+ 
 +static void mptcp_worker(struct work_struct *work)
 +{
 +	struct mptcp_sock *msk = container_of(work, struct mptcp_sock, work);
 +	struct sock *sk = &msk->sk.icsk_inet.sk;
 +
 +	lock_sock(sk);
 +	__mptcp_move_skbs(msk);
 +	release_sock(sk);
 +	sock_put(sk);
 +}
 +
  static int __mptcp_init_sock(struct sock *sk)
  {
  	struct mptcp_sock *msk = mptcp_sk(sk);
  
  	INIT_LIST_HEAD(&msk->conn_list);
  	__set_bit(MPTCP_SEND_SPACE, &msk->flags);
 +	INIT_WORK(&msk->work, mptcp_worker);
  
  	msk->first = NULL;
+ 	inet_csk(sk)->icsk_sync_mss = mptcp_sync_mss;
  
  	return 0;
  }
diff --cc net/smc/smc_core.h
index 5695c7bc639ea,234ae25f0025f..8041db20c7531
--- a/net/smc/smc_core.h
+++ b/net/smc/smc_core.h
@@@ -290,7 -296,8 +290,8 @@@ struct smc_clc_msg_accept_confirm
  struct smc_clc_msg_local;
  
  void smc_lgr_forget(struct smc_link_group *lgr);
+ void smc_lgr_cleanup_early(struct smc_connection *conn);
 -void smc_lgr_terminate(struct smc_link_group *lgr, bool soft);
 +void smc_lgr_terminate_sched(struct smc_link_group *lgr);
  void smc_port_terminate(struct smc_ib_device *smcibdev, u8 ibport);
  void smc_smcd_terminate(struct smcd_dev *dev, u64 peer_gid,
  			unsigned short vlan);
diff --cc net/wireless/nl80211.c
index 59f233790686d,5b19e9fac4aac..15000275b32d5
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -4986,18 -4801,9 +4987,17 @@@ static int nl80211_start_ap(struct sk_b
  		err = nl80211_parse_he_obss_pd(
  					info->attrs[NL80211_ATTR_HE_OBSS_PD],
  					&params.he_obss_pd);
- 		if (err)
- 			return err;
+ 		goto out;
  	}
  
 +	if (info->attrs[NL80211_ATTR_HE_BSS_COLOR]) {
 +		err = nl80211_parse_he_bss_color(
 +					info->attrs[NL80211_ATTR_HE_BSS_COLOR],
 +					&params.he_bss_color);
 +		if (err)
 +			return err;
 +	}
 +
  	nl80211_calculate_ap_params(&params);
  
  	if (info->attrs[NL80211_ATTR_EXTERNAL_AUTH_SUPPORT])