diff options
author | Jonathan Corbet <corbet@lwn.net> | 2018-07-02 11:14:50 -0600 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2018-07-02 11:14:50 -0600 |
commit | 5f6654094ff35a7a92eb76667788ef633595e4ea (patch) | |
tree | 8404c5fb245cddbc6877b97a9bf53139c95da852 /drivers/net/ethernet/marvell/mvneta.c | |
parent | 5105730fbf6789ff9e20837bdefe32e8ba133595 (diff) | |
parent | 021c91791a5e7e85c567452f1be3e4c2c6cb6063 (diff) | |
download | linux-stable-5f6654094ff35a7a92eb76667788ef633595e4ea.tar.gz linux-stable-5f6654094ff35a7a92eb76667788ef633595e4ea.tar.bz2 linux-stable-5f6654094ff35a7a92eb76667788ef633595e4ea.zip |
Merge tag 'v4.18-rc3' into docs-next
-rc1 broke the docs build due to changes in the e100/e1000 drivers; -rc3
got the fixes via the networking tree. Pull in -rc3 so that the docs tree
can actually build the docs again.
Diffstat (limited to 'drivers/net/ethernet/marvell/mvneta.c')
-rw-r--r-- | drivers/net/ethernet/marvell/mvneta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 17a904cc6a5e..0ad2f3f7da85 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -1932,7 +1932,7 @@ static int mvneta_rx_swbm(struct mvneta_port *pp, int rx_todo, rx_bytes = rx_desc->data_size - (ETH_FCS_LEN + MVNETA_MH_SIZE); index = rx_desc - rxq->descs; data = rxq->buf_virt_addr[index]; - phys_addr = rx_desc->buf_phys_addr; + phys_addr = rx_desc->buf_phys_addr - pp->rx_offset_correction; if (!mvneta_rxq_desc_is_first_last(rx_status) || (rx_status & MVNETA_RXD_ERR_SUMMARY)) { |