diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2017-11-30 22:25:57 +0530 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2017-11-30 22:25:57 +0530 |
| commit | fdc7d50b7fe04f676fd4b1b0f58980544faa1469 (patch) | |
| tree | 19669d2da8d12e82c970623093671c7200478985 /drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |
| parent | ae66c84792bf48ed4bb9cb4309abdf01dbe2a4f9 (diff) | |
| parent | 08c15ad2e6278a5fe1b209e8fcdbd2d235c48f34 (diff) | |
Merge remote-tracking branch 'stable/linux-4.4.y' into lts-4.4.y-hikey4.4.103-hikey
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 83645d8503d4..a5b443171b8b 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -1114,7 +1114,7 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector, break; /* prevent any other reads prior to eop_desc */ - read_barrier_depends(); + smp_rmb(); /* if DD is not set pending work has not been completed */ if (!(eop_desc->wb.status & cpu_to_le32(IXGBE_TXD_STAT_DD))) |