Skip to content

Commit

Permalink
net: mvneta: remove unnecessary if condition in mvneta_xdp_submit_frame
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lorenzo Bianconi authored and David S. Miller committed Jan 28, 2022
1 parent 9c8c440 commit c52db24
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/net/ethernet/marvell/mvneta.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit c52db24

Please sign in to comment.