From 1b5bfa6a3fdd214f046fa328612d3e910920d311 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Tue, 8 Jan 2013 07:00:58 +0000 Subject: [PATCH] --- yaml --- r: 352097 b: refs/heads/master c: 7e63bf490151f7e457002fc046601bb6bb541fa3 h: refs/heads/master i: 352095: 050cf89eab41cd6c9933823879b0a184d15f715b v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b1867bb651cc..ace35b2e6c1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 434c5e3954642b4e87841b13084f42d18b9984ad +refs/heads/master: 7e63bf490151f7e457002fc046601bb6bb541fa3 diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 88500dd2d4a9..ef9cb0ab4314 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -838,7 +838,7 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_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(IXGBE_TXD_STAT_DD)))