From: David S. Miller <davem@davemloft.net>
Date: Wed, 9 Feb 2011 01:19:01 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: upstream/snapshot3+hdmi~11215^2~399
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/e1000e/netdev.c
---

263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea
diff --cc drivers/net/e1000e/netdev.c
index 5b916b0,3065870..6025d5f
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@@ -4303,18 -4299,20 +4303,17 @@@ link_up
  
  	e1000e_update_adaptive(&adapter->hw);
  
 -	if (!netif_carrier_ok(netdev)) {
 -		tx_pending = (e1000_desc_unused(tx_ring) + 1 <
 -			       tx_ring->count);
 -		if (tx_pending) {
 -			/*
 -			 * We've lost link, so the controller stops DMA,
 -			 * but we've got queued Tx work that's never going
 -			 * to get done, so reset controller to flush Tx.
 -			 * (Do the reset outside of interrupt context).
 -			 */
 -			schedule_work(&adapter->reset_task);
 -			/* return immediately since reset is imminent */
 -			return;
 -		}
 +	if (!netif_carrier_ok(netdev) &&
 +	    (e1000_desc_unused(tx_ring) + 1 < tx_ring->count)) {
 +		/*
 +		 * We've lost link, so the controller stops DMA,
 +		 * but we've got queued Tx work that's never going
 +		 * to get done, so reset controller to flush Tx.
 +		 * (Do the reset outside of interrupt context).
 +		 */
- 		adapter->tx_timeout_count++;
 +		schedule_work(&adapter->reset_task);
 +		/* return immediately since reset is imminent */
 +		return;
  	}
  
  	/* Simple mode for Interrupt Throttle Rate (ITR) */
diff --cc drivers/net/wireless/ath/ath9k/ath9k.h
index 7c8409e,23838e3..9272278
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@@ -600,10 -594,7 +601,9 @@@ struct ath_softc 
  	struct work_struct paprd_work;
  	struct work_struct hw_check_work;
  	struct completion paprd_complete;
- 	bool paprd_pending;
  
 +	unsigned int hw_busy_count;
 +
  	u32 intrstatus;
  	u32 sc_flags; /* SC_OP_* */
  	u16 ps_flags; /* PS_* */
diff --cc net/core/dev.c
index f46ee35,8e726cb..6392ea0
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@@ -5816,22 -5679,16 +5826,17 @@@ struct net_device *alloc_netdev_mqs(in
  	dev->num_rx_queues = rxqs;
  	dev->real_num_rx_queues = rxqs;
  	if (netif_alloc_rx_queues(dev))
- 		goto free_pcpu;
+ 		goto free_all;
  #endif
  
- 	dev->gso_max_size = GSO_MAX_SIZE;
- 
- 	INIT_LIST_HEAD(&dev->ethtool_ntuple_list.list);
- 	dev->ethtool_ntuple_list.count = 0;
- 	INIT_LIST_HEAD(&dev->napi_list);
- 	INIT_LIST_HEAD(&dev->unreg_list);
- 	INIT_LIST_HEAD(&dev->link_watch_list);
- 	dev->priv_flags = IFF_XMIT_DST_RELEASE;
- 	setup(dev);
  	strcpy(dev->name, name);
 +	dev->group = INIT_NETDEV_GROUP;
  	return dev;
  
+ free_all:
+ 	free_netdev(dev);
+ 	return NULL;
+ 
  free_pcpu:
  	free_percpu(dev->pcpu_refcnt);
  	kfree(dev->_tx);