diff options
| author |   Claudiu Manoil <claudiu.manoil@nxp.com> | 2019-05-15 19:08:56 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-05-15 09:14:29 -0700 |
| commit | f4a0be84d73ec648628bf8094600ceb73cb6073f (patch) | |
| tree | bd3c6554dcd1f373361ea5f2c71d9ceef3a4cbd9 /drivers/net/ethernet/freescale/enetc/enetc.c | |
| parent | nfp: flower: add rcu locks when accessing netdev for tunnels (diff) | |
| download | linux-dev-f4a0be84d73ec648628bf8094600ceb73cb6073f.tar.xz linux-dev-f4a0be84d73ec648628bf8094600ceb73cb6073f.zip | |
enetc: Fix NULL dma address unmap for Tx BD extensions
For the unlikely case of TxBD extensions (i.e. ptp)
the driver tries to unmap the tx_swbd corresponding
to the extension, which is bogus as it has no buffer
attached.
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/enetc/enetc.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/enetc/enetc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index 5bb9eb35d76d..491475d87736 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -313,7 +313,9 @@ static bool enetc_clean_tx_ring(struct enetc_bdr *tx_ring, int napi_budget) while (bds_to_clean && tx_frm_cnt < ENETC_DEFAULT_TX_WORK) { bool is_eof = !!tx_swbd->skb; - enetc_unmap_tx_buff(tx_ring, tx_swbd); + if (likely(tx_swbd->dma)) + enetc_unmap_tx_buff(tx_ring, tx_swbd); + if (is_eof) { napi_consume_skb(tx_swbd->skb, napi_budget); tx_swbd->skb = NULL; |