From: David S. Miller <davem@davemloft.net>
Date: Thu, 19 Jul 2012 18:17:30 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.6-rc1~125^2~60
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=abaa72d7fd9a20a67b62e6afa0e746e27851dc33;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

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

Conflicts:
	drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
---

abaa72d7fd9a20a67b62e6afa0e746e27851dc33
diff --cc drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index ce81ce0,41e3225..2dc78d7
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@@ -193,12 -201,15 +193,15 @@@ static bool ixgbevf_clean_tx_irq(struc
  	unsigned int i, eop, count = 0;
  	unsigned int total_bytes = 0, total_packets = 0;
  
+ 	if (test_bit(__IXGBEVF_DOWN, &adapter->state))
+ 		return true;
+ 
  	i = tx_ring->next_to_clean;
  	eop = tx_ring->tx_buffer_info[i].next_to_watch;
 -	eop_desc = IXGBE_TX_DESC_ADV(*tx_ring, eop);
 +	eop_desc = IXGBEVF_TX_DESC(tx_ring, eop);
  
  	while ((eop_desc->wb.status & cpu_to_le32(IXGBE_TXD_STAT_DD)) &&
 -	       (count < tx_ring->work_limit)) {
 +	       (count < tx_ring->count)) {
  		bool cleaned = false;
  		rmb(); /* read buffer_info after eop_desc */
  		/* eop could change between read and DD-check */