From: David S. Miller <davem@davemloft.net>
Date: Tue, 20 Oct 2015 13:08:27 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: MMI-PSA29.97-13-9~9125^2~102
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=26440c835f8b1a491e2704118ac55bf87334366c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

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

26440c835f8b1a491e2704118ac55bf87334366c
diff --cc drivers/net/ethernet/mellanox/mlx5/core/port.c
index ae302614e74b,3b9480fa3403..a87e773e93f3
--- a/drivers/net/ethernet/mellanox/mlx5/core/port.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/port.c
@@@ -300,12 -308,15 +300,12 @@@ static int mlx5_query_port_pvlc(struct 
  				int pvlc_size,  u8 local_port)
  {
  	u32 in[MLX5_ST_SZ_DW(pvlc_reg)];
 -	int err;
  
  	memset(in, 0, sizeof(in));
- 	MLX5_SET(ptys_reg, in, local_port, local_port);
+ 	MLX5_SET(pvlc_reg, in, local_port, local_port);
  
 -	err = mlx5_core_access_reg(dev, in, sizeof(in), pvlc,
 -				   pvlc_size, MLX5_REG_PVLC, 0, 0);
 -
 -	return err;
 +	return mlx5_core_access_reg(dev, in, sizeof(in), pvlc,
 +				    pvlc_size, MLX5_REG_PVLC, 0, 0);
  }
  
  int mlx5_query_port_vl_hw_cap(struct mlx5_core_dev *dev,
diff --cc net/ipv6/route.c
index 5fc1149fe91d,968f31c01f89..d0619632723a
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@@ -1198,18 -1213,14 +1198,14 @@@ struct dst_entry *ip6_blackhole_route(s
  
  	rt = dst_alloc(&ip6_dst_blackhole_ops, ort->dst.dev, 1, DST_OBSOLETE_NONE, 0);
  	if (rt) {
- 		new = &rt->dst;
- 
- 		memset(new + 1, 0, sizeof(*rt) - sizeof(*new));
+ 		rt6_info_init(rt);
  
+ 		new = &rt->dst;
  		new->__use = 1;
  		new->input = dst_discard;
 -		new->output = dst_discard_sk;
 +		new->output = dst_discard_out;
  
- 		if (dst_metrics_read_only(&ort->dst))
- 			new->_metrics = ort->dst._metrics;
- 		else
- 			dst_copy_metrics(new, &ort->dst);
+ 		dst_copy_metrics(new, &ort->dst);
  		rt->rt6i_idev = ort->rt6i_idev;
  		if (rt->rt6i_idev)
  			in6_dev_hold(rt->rt6i_idev);
diff --cc net/switchdev/switchdev.c
index 73e3895175cf,77f5d17e2612..1eb76956b439
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@@ -15,10 -15,8 +15,11 @@@
  #include <linux/mutex.h>
  #include <linux/notifier.h>
  #include <linux/netdevice.h>
 +#include <linux/etherdevice.h>
  #include <linux/if_bridge.h>
 +#include <linux/list.h>
 +#include <linux/workqueue.h>
+ #include <linux/if_vlan.h>
  #include <net/ip_fib.h>
  #include <net/switchdev.h>
  
@@@ -846,33 -635,32 +847,35 @@@ static int switchdev_port_br_afspec(str
  		if (nla_len(attr) != sizeof(struct bridge_vlan_info))
  			return -EINVAL;
  		vinfo = nla_data(attr);
+ 		if (!vinfo->vid || vinfo->vid >= VLAN_VID_MASK)
+ 			return -EINVAL;
 -		vlan->flags = vinfo->flags;
 +		vlan.flags = vinfo->flags;
  		if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) {
 -			if (vlan->vid_begin)
 +			if (vlan.vid_begin)
 +				return -EINVAL;
 +			vlan.vid_begin = vinfo->vid;
 +			/* don't allow range of pvids */
 +			if (vlan.flags & BRIDGE_VLAN_INFO_PVID)
  				return -EINVAL;
 -			vlan->vid_begin = vinfo->vid;
  		} else if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_END) {
 -			if (!vlan->vid_begin)
 +			if (!vlan.vid_begin)
  				return -EINVAL;
 -			vlan->vid_end = vinfo->vid;
 -			if (vlan->vid_end <= vlan->vid_begin)
 +			vlan.vid_end = vinfo->vid;
 +			if (vlan.vid_end <= vlan.vid_begin)
  				return -EINVAL;
 -			err = f(dev, &obj);
 +			err = f(dev, &vlan.obj);
  			if (err)
  				return err;
 -			memset(vlan, 0, sizeof(*vlan));
 +			memset(&vlan, 0, sizeof(vlan));
  		} else {
 -			if (vlan->vid_begin)
 +			if (vlan.vid_begin)
  				return -EINVAL;
 -			vlan->vid_begin = vinfo->vid;
 -			vlan->vid_end = vinfo->vid;
 -			err = f(dev, &obj);
 +			vlan.vid_begin = vinfo->vid;
 +			vlan.vid_end = vinfo->vid;
 +			err = f(dev, &vlan.obj);
  			if (err)
  				return err;
 -			memset(vlan, 0, sizeof(*vlan));
 +			memset(&vlan, 0, sizeof(vlan));
  		}
  	}