2
0

708-01-v5.16-net-mvneta-Delete-unused-variable.patch 2.2 KB

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