From afb238532f878e889d948da74441e1ce071498e3 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Tue, 8 Jan 2013 07:01:03 +0000 Subject: [PATCH] --- yaml --- r: 351493 b: refs/heads/master c: 70d289bcef24eca45dadf2f10fe79a936589216e h: refs/heads/master i: 351491: 1f9976ac5e1ff98ac18bd344cc26937daf700b32 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/igb/igb_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5244af8d665b..3ed7a51bcd8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 088245a3584d13f94ff0b4c1610dae7d897b28f9 +refs/heads/master: 70d289bcef24eca45dadf2f10fe79a936589216e diff --git a/trunk/drivers/net/ethernet/intel/igb/igb_main.c b/trunk/drivers/net/ethernet/intel/igb/igb_main.c index c9e438ba1ec2..78354046cb3b 100644 --- a/trunk/drivers/net/ethernet/intel/igb/igb_main.c +++ b/trunk/drivers/net/ethernet/intel/igb/igb_main.c @@ -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)))