From: Bruce Allan Date: Fri, 16 Dec 2011 00:46:01 +0000 (+0000) Subject: e1000e: always set transmit descriptor control registers the same X-Git-Tag: firefly_0821_release~3680^2~3338^2~489 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=56032be77c7eab50e2020247ffa35ca61850503f;p=firefly-linux-kernel-4.4.55.git e1000e: always set transmit descriptor control registers the same The hardware erratum workaround where the TXDCTL register must be the same setting for both queues should always be done. Signed-off-by: Bruce Allan Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher --- diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index ffe4583994d8..6081dee5ce46 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -2817,9 +2817,9 @@ static void e1000_configure_tx(struct e1000_adapter *adapter) */ txdctl |= E1000_TXDCTL_DMA_BURST_ENABLE; ew32(TXDCTL(0), txdctl); - /* erratum work around: set txdctl the same for both queues */ - ew32(TXDCTL(1), txdctl); } + /* erratum work around: set txdctl the same for both queues */ + ew32(TXDCTL(1), er32(TXDCTL(0))); /* Program the Transmit Control Register */ tctl = er32(TCTL);