target/linux/generic/backport-5.15/708-01-v5.16-net-mvneta-Delete-unused-variable.patch

   1 From 43ed6fff01333868a1d0e19876f67c22d9939952 Mon Sep 17 00:00:00 2001
   2 From: Yuval Shaia <yshaia@marvell.com>
   3 Date: Wed, 13 Oct 2021 09:49:21 +0300
   4 Subject: [PATCH] net: mvneta: Delete unused variable
   5
   6 The variable pp is not in use - delete it.
   7
   8 Signed-off-by: Yuval Shaia <yshaia@marvell.com>
   9 Link: https://lore.kernel.org/r/20211013064921.26346-1-yshaia@marvell.com
  10 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  11 ---
  12  drivers/net/ethernet/marvell/mvneta.c | 11 +++++------
  13  1 file changed, 5 insertions(+), 6 deletions(-)
  14
  15 --- a/drivers/net/ethernet/marvell/mvneta.c
  16 +++ b/drivers/net/ethernet/marvell/mvneta.c
  17 @@ -1914,7 +1914,7 @@ static int mvneta_rx_refill(struct mvnet
  18  }
  19
  20  /* Handle tx checksum */
  21 -static u32 mvneta_skb_tx_csum(struct mvneta_port *pp, struct sk_buff *skb)
  22 +static u32 mvneta_skb_tx_csum(struct sk_buff *skb)
  23  {
  24         if (skb->ip_summed == CHECKSUM_PARTIAL) {
  25                 int ip_hdr_len = 0;
  26 @@ -2595,8 +2595,7 @@ err_drop_frame:
  27  }
  28
  29  static inline void
  30 -mvneta_tso_put_hdr(struct sk_buff *skb,
  31 -                  struct mvneta_port *pp, struct mvneta_tx_queue *txq)
  32 +mvneta_tso_put_hdr(struct sk_buff *skb, struct mvneta_tx_queue *txq)
  33  {
  34         int hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
  35         struct mvneta_tx_buf *buf = &txq->buf[txq->txq_put_index];
  36 @@ -2604,7 +2603,7 @@ mvneta_tso_put_hdr(struct sk_buff *skb,
  37
  38         tx_desc = mvneta_txq_next_desc_get(txq);
  39         tx_desc->data_size = hdr_len;
  40 -       tx_desc->command = mvneta_skb_tx_csum(pp, skb);
  41 +       tx_desc->command = mvneta_skb_tx_csum(skb);
  42         tx_desc->command |= MVNETA_TXD_F_DESC;
  43         tx_desc->buf_phys_addr = txq->tso_hdrs_phys +
  44                                  txq->txq_put_index * TSO_HEADER_SIZE;
  45 @@ -2681,7 +2680,7 @@ static int mvneta_tx_tso(struct sk_buff
  46                 hdr = txq->tso_hdrs + txq->txq_put_index * TSO_HEADER_SIZE;
  47                 tso_build_hdr(skb, hdr, &tso, data_left, total_len == 0);
  48
  49 -               mvneta_tso_put_hdr(skb, pp, txq);
  50 +               mvneta_tso_put_hdr(skb, txq);
  51
  52                 while (data_left > 0) {
  53                         int size;
  54 @@ -2799,7 +2798,7 @@ static netdev_tx_t mvneta_tx(struct sk_b
  55         /* Get a descriptor for the first part of the packet */
  56         tx_desc = mvneta_txq_next_desc_get(txq);
  57
  58 -       tx_cmd = mvneta_skb_tx_csum(pp, skb);
  59 +       tx_cmd = mvneta_skb_tx_csum(skb);
  60
  61         tx_desc->data_size = skb_headlen(skb);
  62