From: David S. Miller <davem@davemloft.net>
Date: Tue, 12 Mar 2013 09:52:22 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v5.15~20166^2~514
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf;p=platform%2Fkernel%2Flinux-starfive.git

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

Conflicts:
	drivers/net/ethernet/intel/e1000e/netdev.c

Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.

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

e5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf
diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
index b4eab18,948b86ff..142ca39
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@@ -5960,27 -5977,8 +5951,6 @@@ static int __e1000_shutdown(struct pci_
  	 */
  	e1000e_release_hw_control(adapter);
  
- 	pci_disable_device(pdev);
- 
- 	return 0;
- }
- 
- static void e1000_power_off(struct pci_dev *pdev, bool sleep, bool wake)
- {
- 	if (sleep && wake) {
- 		pci_prepare_to_sleep(pdev);
- 		return;
- 	}
- 
- 	pci_wake_from_d3(pdev, wake);
- 	pci_set_power_state(pdev, PCI_D3hot);
- }
- 
- static void e1000_complete_shutdown(struct pci_dev *pdev, bool sleep, bool wake)
- {
- 	struct net_device *netdev = pci_get_drvdata(pdev);
- 	struct e1000_adapter *adapter = netdev_priv(netdev);
 -	pci_clear_master(pdev);
--
  	/* The pci-e switch on some quad port adapters will report a
  	 * correctable error when the MAC transitions from D0 to D3.  To
  	 * prevent this we need to mask off the correctable errors on the
diff --cc drivers/net/vxlan.c
index f3a135c,7cee7a3..db0df07
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@@ -974,12 -961,26 +974,14 @@@ static netdev_tx_t vxlan_xmit(struct sk
  	iph->ttl	= ttl ? : ip4_dst_hoplimit(&rt->dst);
  	tunnel_ip_select_ident(skb, old_iph, &rt->dst);
  
+ 	nf_reset(skb);
+ 
  	vxlan_set_owner(dev, skb);
  
 -	/* See iptunnel_xmit() */
 -	if (skb->ip_summed != CHECKSUM_PARTIAL)
 -		skb->ip_summed = CHECKSUM_NONE;
 -
 -	err = ip_local_out(skb);
 -	if (likely(net_xmit_eval(err) == 0)) {
 -		struct vxlan_stats *stats = this_cpu_ptr(vxlan->stats);
 +	if (handle_offloads(skb))
 +		goto drop;
  
 -		u64_stats_update_begin(&stats->syncp);
 -		stats->tx_packets++;
 -		stats->tx_bytes += pkt_len;
 -		u64_stats_update_end(&stats->syncp);
 -	} else {
 -		dev->stats.tx_errors++;
 -		dev->stats.tx_aborted_errors++;
 -	}
 +	iptunnel_xmit(skb, dev);
  	return NETDEV_TX_OK;
  
  drop: