ionic: Pass ionic_txq_desc to ionic_tx_tso_post
authorBrett Creeley <brett.creeley@amd.com>
Wed, 29 May 2024 00:02:55 +0000 (17:02 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 31 May 2024 01:10:34 +0000 (18:10 -0700)
Pass the ionic_txq_desc instead of re-referencing it from the q->txq
array since the caller to ionic_tx_tso_post will always have the
current ionic_txq_desc pointer already.

Signed-off-by: Brett Creeley <brett.creeley@amd.com>
Signed-off-by: Shannon Nelson <shannon.nelson@amd.com>
Link: https://lore.kernel.org/r/20240529000259.25775-4-shannon.nelson@amd.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/pensando/ionic/ionic_txrx.c

index 5dba6d2d633cb6d26487b9e6db87307ab12ddef0..c6aa8fb743be0d41aec0278a895d5ca6b704aa49 100644 (file)
@@ -1357,7 +1357,7 @@ static int ionic_tx_tcp_pseudo_csum(struct sk_buff *skb)
 }
 
 static void ionic_tx_tso_post(struct net_device *netdev, struct ionic_queue *q,
-                             struct ionic_tx_desc_info *desc_info,
+                             struct ionic_txq_desc *desc,
                              struct sk_buff *skb,
                              dma_addr_t addr, u8 nsge, u16 len,
                              unsigned int hdrlen, unsigned int mss,
@@ -1365,7 +1365,6 @@ static void ionic_tx_tso_post(struct net_device *netdev, struct ionic_queue *q,
                              u16 vlan_tci, bool has_vlan,
                              bool start, bool done)
 {
-       struct ionic_txq_desc *desc = &q->txq[q->head_idx];
        u8 flags = 0;
        u64 cmd;
 
@@ -1503,10 +1502,9 @@ static int ionic_tx_tso(struct net_device *netdev, struct ionic_queue *q,
                seg_rem = min(tso_rem, mss);
                done = (tso_rem == 0);
                /* post descriptor */
-               ionic_tx_tso_post(netdev, q, desc_info, skb,
-                                 desc_addr, desc_nsge, desc_len,
-                                 hdrlen, mss, outer_csum, vlan_tci, has_vlan,
-                                 start, done);
+               ionic_tx_tso_post(netdev, q, desc, skb, desc_addr, desc_nsge,
+                                 desc_len, hdrlen, mss, outer_csum, vlan_tci,
+                                 has_vlan, start, done);
                start = false;
                /* Buffer information is stored with the first tso descriptor */
                desc_info = &q->tx_info[q->head_idx];