diff options
| author | Lorenzo Bianconi <lorenzo@kernel.org> | 2022-01-27 15:47:49 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-01-28 14:29:19 +0000 |
| commit | c52db24619179b5f00ddbae8f8c4186ebb50a504 (patch) | |
| tree | 977db145f731bcd72461a7e2dc24a31e7689a829 /drivers/net/ethernet/marvell/mvneta.c | |
| parent | 9c8c44022b0da6ded7c481368a95f788c69bbcb1 (diff) | |
net: mvneta: remove unnecessary if condition in mvneta_xdp_submit_frame
Get rid of unnecessary if check on tx_desc pointer in
mvneta_xdp_submit_frame routine since num_frames is always greater than
0 and tx_desc pointer is always initialized.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell/mvneta.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvneta.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 315a43e4c63d..f1335a1ed695 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -2083,7 +2083,7 @@ mvneta_xdp_submit_frame(struct mvneta_port *pp, struct mvneta_tx_queue *txq, { struct skb_shared_info *sinfo = xdp_get_shared_info_from_frame(xdpf); struct device *dev = pp->dev->dev.parent; - struct mvneta_tx_desc *tx_desc = NULL; + struct mvneta_tx_desc *tx_desc; int i, num_frames = 1; struct page *page; @@ -2140,10 +2140,8 @@ mvneta_xdp_submit_frame(struct mvneta_port *pp, struct mvneta_tx_queue *txq, mvneta_txq_inc_put(txq); } - /*last descriptor */ - if (likely(tx_desc)) - tx_desc->command |= MVNETA_TXD_L_DESC | MVNETA_TXD_Z_PAD; + tx_desc->command |= MVNETA_TXD_L_DESC | MVNETA_TXD_Z_PAD; txq->pending += num_frames; txq->count += num_frames; |