aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e/netdev.c
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2012-08-17 02:18:07 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-08-30 22:09:06 -0400
commitbc76329d4a788b1c5f2de7208b2fae4e9204223c (patch)
tree3b9d27e6fa88d18d4707d6fb2ff9eaa06bebb1a5 /drivers/net/ethernet/intel/e1000e/netdev.c
parentefc38d2af55d80b4420dab71f6634ad7aa34a38c (diff)
e1000e: cleanup strict checkpatch MEMORY_BARRIER checks
Add comments to memory barriers per strict checkpatch. Signed-off-by: Bruce Allan <bruce.w.allan@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/netdev.c')
-rw-r--r--drivers/net/ethernet/intel/e1000e/netdev.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 46c3b1f9ff89..fb6c813f5f86 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -3746,6 +3746,10 @@ static irqreturn_t e1000_intr_msi_test(int irq, void *data)
3746 e_dbg("icr is %08X\n", icr); 3746 e_dbg("icr is %08X\n", icr);
3747 if (icr & E1000_ICR_RXSEQ) { 3747 if (icr & E1000_ICR_RXSEQ) {
3748 adapter->flags &= ~FLAG_MSI_TEST_FAILED; 3748 adapter->flags &= ~FLAG_MSI_TEST_FAILED;
3749 /*
3750 * Force memory writes to complete before acknowledging the
3751 * interrupt is handled.
3752 */
3749 wmb(); 3753 wmb();
3750 } 3754 }
3751 3755
@@ -3787,6 +3791,10 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
3787 goto msi_test_failed; 3791 goto msi_test_failed;
3788 } 3792 }
3789 3793
3794 /*
3795 * Force memory writes to complete before enabling and firing an
3796 * interrupt.
3797 */
3790 wmb(); 3798 wmb();
3791 3799
3792 e1000_irq_enable(adapter); 3800 e1000_irq_enable(adapter);
@@ -3798,7 +3806,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
3798 3806
3799 e1000_irq_disable(adapter); 3807 e1000_irq_disable(adapter);
3800 3808
3801 rmb(); 3809 rmb(); /* read flags after interrupt has been fired */
3802 3810
3803 if (adapter->flags & FLAG_MSI_TEST_FAILED) { 3811 if (adapter->flags & FLAG_MSI_TEST_FAILED) {
3804 adapter->int_mode = E1000E_INT_MODE_LEGACY; 3812 adapter->int_mode = E1000E_INT_MODE_LEGACY;