From: David S. Miller <davem@davemloft.net>
Date: Tue, 2 Jun 2015 05:33:25 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dda922c831d1661c11a3ae1051b7160236f6ffb0;p=linux-beck.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/phy/amd-xgbe-phy.c
	drivers/net/wireless/iwlwifi/Kconfig
	include/net/mac80211.h

iwlwifi/Kconfig and mac80211.h were both trivial overlapping
changes.

The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and
the bug fix that happened on the 'net' side is already integrated
into the rest of the amd-xgbe driver.

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

dda922c831d1661c11a3ae1051b7160236f6ffb0
diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
index 1c37f587426d,28425e5ea91f..2510fed3494d
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@@ -458,77 -507,6 +458,74 @@@ static int mlx5_core_disable_hca(struc
  	return 0;
  }
  
 +static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i)
 +{
 +	struct mlx5_priv *priv  = &mdev->priv;
 +	struct msix_entry *msix = priv->msix_arr;
 +	int irq                 = msix[i + MLX5_EQ_VEC_COMP_BASE].vector;
 +	int numa_node           = dev_to_node(&mdev->pdev->dev);
 +	int err;
 +
 +	if (!zalloc_cpumask_var(&priv->irq_info[i].mask, GFP_KERNEL)) {
 +		mlx5_core_warn(mdev, "zalloc_cpumask_var failed");
 +		return -ENOMEM;
 +	}
 +
- 	err = cpumask_set_cpu_local_first(i, numa_node, priv->irq_info[i].mask);
- 	if (err) {
- 		mlx5_core_warn(mdev, "cpumask_set_cpu_local_first failed");
- 		goto err_clear_mask;
- 	}
++	cpumask_set_cpu(cpumask_local_spread(i, numa_node),
++			priv->irq_info[i].mask);
 +
 +	err = irq_set_affinity_hint(irq, priv->irq_info[i].mask);
 +	if (err) {
 +		mlx5_core_warn(mdev, "irq_set_affinity_hint failed,irq 0x%.4x",
 +			       irq);
 +		goto err_clear_mask;
 +	}
 +
 +	return 0;
 +
 +err_clear_mask:
 +	free_cpumask_var(priv->irq_info[i].mask);
 +	return err;
 +}
 +
 +static void mlx5_irq_clear_affinity_hint(struct mlx5_core_dev *mdev, int i)
 +{
 +	struct mlx5_priv *priv  = &mdev->priv;
 +	struct msix_entry *msix = priv->msix_arr;
 +	int irq                 = msix[i + MLX5_EQ_VEC_COMP_BASE].vector;
 +
 +	irq_set_affinity_hint(irq, NULL);
 +	free_cpumask_var(priv->irq_info[i].mask);
 +}
 +
 +static int mlx5_irq_set_affinity_hints(struct mlx5_core_dev *mdev)
 +{
 +	int err;
 +	int i;
 +
 +	for (i = 0; i < mdev->priv.eq_table.num_comp_vectors; i++) {
 +		err = mlx5_irq_set_affinity_hint(mdev, i);
 +		if (err)
 +			goto err_out;
 +	}
 +
 +	return 0;
 +
 +err_out:
 +	for (i--; i >= 0; i--)
 +		mlx5_irq_clear_affinity_hint(mdev, i);
 +
 +	return err;
 +}
 +
 +static void mlx5_irq_clear_affinity_hints(struct mlx5_core_dev *mdev)
 +{
 +	int i;
 +
 +	for (i = 0; i < mdev->priv.eq_table.num_comp_vectors; i++)
 +		mlx5_irq_clear_affinity_hint(mdev, i);
 +}
 +
  int mlx5_vector2eqn(struct mlx5_core_dev *dev, int vector, int *eqn, int *irqn)
  {
  	struct mlx5_eq_table *table = &dev->priv.eq_table;
diff --cc drivers/net/wireless/iwlwifi/Kconfig
index 99f9760fc11e,f89f446e5c8a..aba095761ac6
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@@ -21,7 -21,7 +21,8 @@@ config IWLWIF
  		Intel 7260 Wi-Fi Adapter
  		Intel 3160 Wi-Fi Adapter
  		Intel 7265 Wi-Fi Adapter
 +		Intel 8260 Wi-Fi Adapter
+ 		Intel 3165 Wi-Fi Adapter
  
  
  	  This driver uses the kernel's mac80211 subsystem.
diff --cc net/unix/af_unix.c
index b8c44076c776,06430598cf51..f25e1675b865
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@@ -2055,8 -1943,11 +2059,12 @@@ static int unix_stream_read_generic(str
  		struct sk_buff *skb, *last;
  
  		unix_state_lock(sk);
+ 		if (sock_flag(sk, SOCK_DEAD)) {
+ 			err = -ECONNRESET;
+ 			goto unlock;
+ 		}
  		last = skb = skb_peek(&sk->sk_receive_queue);
 +		last_len = last ? last->len : 0;
  again:
  		if (skb == NULL) {
  			unix_sk(sk)->recursion_level = 0;