diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2020-04-04 11:02:15 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2020-04-04 11:02:15 +0200 |
| commit | cc46c03397c1865a181f1a4f66d4645806e5a943 (patch) | |
| tree | e3a762d8961219a61b96ae6e5ec875ba9fbe2314 /drivers/net/ethernet/sfc/efx_channels.c | |
| parent | d8a26d8fc37c5b8b9e95f2fa194f287cf8cab3f4 (diff) | |
| parent | 0e7e6198af28c1573267aba1be33dd0b7fb35691 (diff) | |
| download | kernel_replicant_linux-cc46c03397c1865a181f1a4f66d4645806e5a943.tar.gz kernel_replicant_linux-cc46c03397c1865a181f1a4f66d4645806e5a943.tar.bz2 kernel_replicant_linux-cc46c03397c1865a181f1a4f66d4645806e5a943.zip | |
Merge drm/drm-next into drm-misc-next-fixes
Alex needs v5.6 into drm-misc-next-fixes to merge a fix for a regression in
the scatterlist processing in PRIME.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'drivers/net/ethernet/sfc/efx_channels.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/efx_channels.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/sfc/efx_channels.c b/drivers/net/ethernet/sfc/efx_channels.c index aeb5e8aa2f2a..73d4e39b5b16 100644 --- a/drivers/net/ethernet/sfc/efx_channels.c +++ b/drivers/net/ethernet/sfc/efx_channels.c @@ -583,6 +583,7 @@ struct efx_channel *efx_copy_channel(const struct efx_channel *old_channel) if (tx_queue->channel) tx_queue->channel = channel; tx_queue->buffer = NULL; + tx_queue->cb_page = NULL; memset(&tx_queue->txd, 0, sizeof(tx_queue->txd)); } |