]> git.baikalelectronics.ru Git - kernel.git/commitdiff
igb: Replace rmb in Tx cleanup with read_barrier_depends
authorAlexander Duyck <alexander.h.duyck@intel.com>
Tue, 8 Jan 2013 07:01:03 +0000 (07:01 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sat, 19 Jan 2013 12:58:30 +0000 (04:58 -0800)
The rmb in the Tx cleanup path is a much stronger barrier than we really need.
All that is really needed is a read_barrier_depends since the location of the
EOP descriptor is dependent on the eop_desc value.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/igb/igb_main.c

index c9e438ba1ec2333bd72b38ae1a4294a9427970f7..78354046cb3b756f85cae5f3258e97c65c08d5b5 100644 (file)
@@ -5930,7 +5930,7 @@ static bool igb_clean_tx_irq(struct igb_q_vector *q_vector)
                        break;
 
                /* prevent any other reads prior to eop_desc */
-               rmb();
+               read_barrier_depends();
 
                /* if DD is not set pending work has not been completed */
                if (!(eop_desc->wb.status & cpu_to_le32(E1000_TXD_STAT_DD)))