From: David S. Miller <davem@davemloft.net>
Date: Fri, 18 Dec 2015 03:08:28 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.9.8~2476^2~458
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b3e0d3d7bab14f2544a3314bec53a23dc7dd2206;p=platform%2Fkernel%2Flinux-rpi3.git

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

Conflicts:
	drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

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

b3e0d3d7bab14f2544a3314bec53a23dc7dd2206
diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
index 23211e0,4a9873ec..1598fb3
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@@ -10607,17 -10295,13 +10607,23 @@@ static int i40e_probe(struct pci_dev *p
  	/* set up a default setting for link flow control */
  	pf->hw.fc.requested_mode = I40E_FC_NONE;
  
+ 	/* set up the locks for the AQ, do this only once in probe
+ 	 * and destroy them only once in remove
+ 	 */
+ 	mutex_init(&hw->aq.asq_mutex);
+ 	mutex_init(&hw->aq.arq_mutex);
+ 
  	err = i40e_init_adminq(hw);
 +	if (err) {
 +		if (err == I40E_ERR_FIRMWARE_API_VERSION)
 +			dev_info(&pdev->dev,
 +				 "The driver for the device stopped because the NVM image is newer than expected. You must install the most recent version of the network driver.\n");
 +		else
 +			dev_info(&pdev->dev,
 +				 "The driver for the device stopped because the device firmware failed to init. Try updating your NVM image.\n");
 +
 +		goto err_pf_reset;
 +	}
  
  	/* provide nvm, fw, api versions */
  	dev_info(&pdev->dev, "fw %d.%d.%05d api %d.%d nvm %s\n",
diff --cc drivers/net/geneve.c
index 31b19fd,c2b79f5..e6e0092
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@@ -1007,10 -966,7 +1007,8 @@@ static netdev_tx_t geneve6_xmit_skb(str
  	}
  	err = udp_tunnel6_xmit_skb(dst, gs6->sock->sk, skb, dev,
  				   &fl6.saddr, &fl6.daddr, prio, ttl,
 -				   sport, geneve->dst_port, !udp_csum);
 +				   sport, geneve->dst_port,
 +				   !!(flags & GENEVE_F_UDP_ZERO_CSUM6_TX));
- 
- 	iptunnel_xmit_stats(err, &dev->stats, dev->tstats);
  	return NETDEV_TX_OK;
  
  tx_error:
diff --cc include/linux/netdevice.h
index 81b26a5,3143c84..c20b814
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@@ -2127,26 -2084,8 +2127,26 @@@ struct pcpu_sw_netstats 
  })
  
  #define netdev_alloc_pcpu_stats(type)					\
- 	__netdev_alloc_pcpu_stats(type, GFP_KERNEL);
+ 	__netdev_alloc_pcpu_stats(type, GFP_KERNEL)
  
 +enum netdev_lag_tx_type {
 +	NETDEV_LAG_TX_TYPE_UNKNOWN,
 +	NETDEV_LAG_TX_TYPE_RANDOM,
 +	NETDEV_LAG_TX_TYPE_BROADCAST,
 +	NETDEV_LAG_TX_TYPE_ROUNDROBIN,
 +	NETDEV_LAG_TX_TYPE_ACTIVEBACKUP,
 +	NETDEV_LAG_TX_TYPE_HASH,
 +};
 +
 +struct netdev_lag_upper_info {
 +	enum netdev_lag_tx_type tx_type;
 +};
 +
 +struct netdev_lag_lower_state_info {
 +	u8 link_up : 1,
 +	   tx_enabled : 1;
 +};
 +
  #include <linux/notifier.h>
  
  /* netdevice notifier chain. Please remember to update the rtnetlink
diff --cc net/mpls/af_mpls.c
index 4b3b9b3,c32fc41..b18c5ed
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@@ -559,18 -542,12 +567,22 @@@ static int mpls_nh_assign_dev(struct ne
  	if (!mpls_dev_get(dev))
  		goto errout;
  
+ 	if ((nh->nh_via_table == NEIGH_LINK_TABLE) &&
+ 	    (dev->addr_len != nh->nh_via_alen))
+ 		goto errout;
+ 
  	RCU_INIT_POINTER(nh->nh_dev, dev);
  
 +	if (!(dev->flags & IFF_UP)) {
 +		nh->nh_flags |= RTNH_F_DEAD;
 +	} else {
 +		unsigned int flags;
 +
 +		flags = dev_get_flags(dev);
 +		if (!(flags & (IFF_RUNNING | IFF_LOWER_UP)))
 +			nh->nh_flags |= RTNH_F_LINKDOWN;
 +	}
 +
  	return 0;
  
  errout:
@@@ -715,11 -693,9 +731,8 @@@ static int mpls_nh_build_multi(struct m
  			nla_newdst = nla_find(attrs, attrlen, RTA_NEWDST);
  		}
  
- 		if (!nla_via)
- 			goto errout;
- 
  		err = mpls_nh_build(cfg->rc_nlinfo.nl_net, rt, nh,
 -				    rtnh->rtnh_ifindex, nla_via,
 -				    nla_newdst);
 +				    rtnh->rtnh_ifindex, nla_via, nla_newdst);
  		if (err)
  			goto errout;