From c9de7d24d0c0298606091396b265564f39ec61f1 Mon Sep 17 00:00:00 2001
From: Alex Forencich <alex@alexforencich.com>
Date: Fri, 10 Dec 2021 21:03:46 -0800
Subject: [PATCH] Normalize ring_index parameter

---
 modules/mqnic/mqnic.h        | 2 ++
 modules/mqnic/mqnic_cq.c     | 2 ++
 modules/mqnic/mqnic_eq.c     | 2 ++
 modules/mqnic/mqnic_netdev.c | 2 --
 modules/mqnic/mqnic_rx.c     | 2 ++
 modules/mqnic/mqnic_tx.c     | 2 ++
 6 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/mqnic/mqnic.h b/modules/mqnic/mqnic.h
index dec127143..df849fdef 100644
--- a/modules/mqnic/mqnic.h
+++ b/modules/mqnic/mqnic.h
@@ -199,6 +199,7 @@ struct mqnic_ring {
 	struct device *dev;
 	struct net_device *ndev;
 	struct mqnic_priv *priv;
+	int ring_index;
 
 	u32 hw_ptr_mask;
 	u8 __iomem *hw_addr;
@@ -248,6 +249,7 @@ struct mqnic_eq_ring {
 
 	struct net_device *ndev;
 	struct mqnic_priv *priv;
+	int ring_index;
 	int int_index;
 
 	int irq;
diff --git a/modules/mqnic/mqnic_cq.c b/modules/mqnic/mqnic_cq.c
index 3d5accb92..f3edd5c24 100644
--- a/modules/mqnic/mqnic_cq.c
+++ b/modules/mqnic/mqnic_cq.c
@@ -49,6 +49,8 @@ int mqnic_create_cq_ring(struct mqnic_priv *priv, struct mqnic_cq_ring **ring_pt
 	ring->ndev = priv->ndev;
 	ring->priv = priv;
 
+	ring->ring_index = index;
+
 	ring->size = roundup_pow_of_two(size);
 	ring->size_mask = ring->size - 1;
 	ring->stride = roundup_pow_of_two(stride);
diff --git a/modules/mqnic/mqnic_eq.c b/modules/mqnic/mqnic_eq.c
index 79e633d65..7c3047398 100644
--- a/modules/mqnic/mqnic_eq.c
+++ b/modules/mqnic/mqnic_eq.c
@@ -49,6 +49,8 @@ int mqnic_create_eq_ring(struct mqnic_priv *priv, struct mqnic_eq_ring **ring_pt
 	ring->ndev = priv->ndev;
 	ring->priv = priv;
 
+	ring->ring_index = index;
+
 	ring->size = roundup_pow_of_two(size);
 	ring->size_mask = ring->size - 1;
 	ring->stride = roundup_pow_of_two(stride);
diff --git a/modules/mqnic/mqnic_netdev.c b/modules/mqnic/mqnic_netdev.c
index aae9dd670..76499d213 100644
--- a/modules/mqnic/mqnic_netdev.c
+++ b/modules/mqnic/mqnic_netdev.c
@@ -53,7 +53,6 @@ static int mqnic_start_port(struct net_device *ndev)
 	// set up RX completion queues
 	for (k = 0; k < priv->rx_cpl_queue_count; k++) {
 		mqnic_activate_cq_ring(priv->rx_cpl_ring[k], k % priv->event_queue_count);
-		priv->rx_cpl_ring[k]->ring_index = k;
 		priv->rx_cpl_ring[k]->handler = mqnic_rx_irq;
 
 		netif_napi_add(ndev, &priv->rx_cpl_ring[k]->napi,
@@ -76,7 +75,6 @@ static int mqnic_start_port(struct net_device *ndev)
 	// set up TX completion queues
 	for (k = 0; k < priv->tx_cpl_queue_count; k++) {
 		mqnic_activate_cq_ring(priv->tx_cpl_ring[k], k % priv->event_queue_count);
-		priv->tx_cpl_ring[k]->ring_index = k;
 		priv->tx_cpl_ring[k]->handler = mqnic_tx_irq;
 
 		netif_tx_napi_add(ndev, &priv->tx_cpl_ring[k]->napi,
diff --git a/modules/mqnic/mqnic_rx.c b/modules/mqnic/mqnic_rx.c
index 4948e4142..7194f3c89 100644
--- a/modules/mqnic/mqnic_rx.c
+++ b/modules/mqnic/mqnic_rx.c
@@ -50,6 +50,8 @@ int mqnic_create_rx_ring(struct mqnic_priv *priv, struct mqnic_ring **ring_ptr,
 	ring->ndev = priv->ndev;
 	ring->priv = priv;
 
+	ring->ring_index = index;
+
 	ring->size = roundup_pow_of_two(size);
 	ring->size_mask = ring->size - 1;
 	ring->stride = roundup_pow_of_two(stride);
diff --git a/modules/mqnic/mqnic_tx.c b/modules/mqnic/mqnic_tx.c
index fc94b3ffe..647820aa2 100644
--- a/modules/mqnic/mqnic_tx.c
+++ b/modules/mqnic/mqnic_tx.c
@@ -51,6 +51,8 @@ int mqnic_create_tx_ring(struct mqnic_priv *priv, struct mqnic_ring **ring_ptr,
 	ring->ndev = priv->ndev;
 	ring->priv = priv;
 
+	ring->ring_index = index;
+
 	ring->size = roundup_pow_of_two(size);
 	ring->full_size = ring->size >> 1;
 	ring->size_mask = ring->size - 1;