summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e/e1000.h
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-11-18 14:25:00 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-12-05 00:12:11 -0800
commit09357b00255c233705b1cf6d76a8d147340545b8 (patch)
treeeefe3d9ede51b4ec653107c91fb6948aa4e523ce /drivers/net/ethernet/intel/e1000e/e1000.h
parent340e8dc1fb4032b6c8334c9bff20b2aec42ecfd8 (diff)
downloadop-kernel-dev-09357b00255c233705b1cf6d76a8d147340545b8.zip
op-kernel-dev-09357b00255c233705b1cf6d76a8d147340545b8.tar.gz
e1000e: Avoid wrong check on TX hang
Based on the original patch submitted my Michael Wang <wangyun@linux.vnet.ibm.com>. Descriptors may not be write-back while checking TX hang with flag FLAG2_DMA_BURST on. So when we detect hang, we just flush the descriptor and detect again for once. -v2 change 1 to true and 0 to false and remove extra () CC: Michael Wang <wangyun@linux.vnet.ibm.com> CC: Flavio Leitner <fbl@redhat.com> Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/e1000.h')
-rw-r--r--drivers/net/ethernet/intel/e1000e/e1000.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index 9fe18d1..f478a22 100644
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -309,6 +309,7 @@ struct e1000_adapter {
u32 txd_cmd;
bool detect_tx_hung;
+ bool tx_hang_recheck;
u8 tx_timeout_factor;
u32 tx_int_delay;
OpenPOWER on IntegriCloud