diff --git a/modules/mqnic/mqnic_rx.c b/modules/mqnic/mqnic_rx.c
index 4fdb58387..8ec6dace8 100644
--- a/modules/mqnic/mqnic_rx.c
+++ b/modules/mqnic/mqnic_rx.c
@@ -280,7 +280,7 @@ int mqnic_process_rx_cq(struct mqnic_cq_ring *cq_ring, int napi_budget)
 {
 	struct mqnic_priv *priv = cq_ring->priv;
 	struct net_device *ndev = priv->ndev;
-	struct mqnic_ring *ring = priv->rx_ring[cq_ring->ring_index];
+	struct mqnic_ring *rx_ring = priv->rx_ring[cq_ring->ring_index];
 	struct mqnic_rx_info *rx_info;
 	struct mqnic_cpl *cpl;
 	struct sk_buff *skb;
@@ -307,8 +307,8 @@ int mqnic_process_rx_cq(struct mqnic_cq_ring *cq_ring, int napi_budget)
 
 	while (cq_ring->head_ptr != cq_tail_ptr && done < budget) {
 		cpl = (struct mqnic_cpl *)(cq_ring->buf + cq_index * cq_ring->stride);
-		ring_index = le16_to_cpu(cpl->index) & ring->size_mask;
-		rx_info = &ring->rx_info[ring_index];
+		ring_index = le16_to_cpu(cpl->index) & rx_ring->size_mask;
+		rx_info = &rx_ring->rx_info[ring_index];
 		page = rx_info->page;
 
 		if (unlikely(!page)) {
@@ -328,9 +328,9 @@ int mqnic_process_rx_cq(struct mqnic_cq_ring *cq_ring, int napi_budget)
 
 		// RX hardware timestamp
 		if (priv->if_features & MQNIC_IF_FEATURE_PTP_TS)
-			skb_hwtstamps(skb)->hwtstamp = mqnic_read_cpl_ts(priv->mdev, ring, cpl);
+			skb_hwtstamps(skb)->hwtstamp = mqnic_read_cpl_ts(priv->mdev, rx_ring, cpl);
 
-		skb_record_rx_queue(skb, cq_ring->ring_index);
+		skb_record_rx_queue(skb, rx_ring->ring_index);
 
 		// RX hardware checksum
 		if (ndev->features & NETIF_F_RXCSUM) {
@@ -359,8 +359,8 @@ int mqnic_process_rx_cq(struct mqnic_cq_ring *cq_ring, int napi_budget)
 		// hand off SKB
 		napi_gro_frags(&cq_ring->napi);
 
-		ring->packets++;
-		ring->bytes += le16_to_cpu(cpl->len);
+		rx_ring->packets++;
+		rx_ring->bytes += le16_to_cpu(cpl->len);
 
 		done++;
 
@@ -374,26 +374,26 @@ int mqnic_process_rx_cq(struct mqnic_cq_ring *cq_ring, int napi_budget)
 
 	// process ring
 	// read tail pointer from NIC
-	mqnic_rx_read_tail_ptr(ring);
+	mqnic_rx_read_tail_ptr(rx_ring);
 
-	ring_clean_tail_ptr = READ_ONCE(ring->clean_tail_ptr);
-	ring_index = ring_clean_tail_ptr & ring->size_mask;
+	ring_clean_tail_ptr = READ_ONCE(rx_ring->clean_tail_ptr);
+	ring_index = ring_clean_tail_ptr & rx_ring->size_mask;
 
-	while (ring_clean_tail_ptr != ring->tail_ptr) {
-		rx_info = &ring->rx_info[ring_index];
+	while (ring_clean_tail_ptr != rx_ring->tail_ptr) {
+		rx_info = &rx_ring->rx_info[ring_index];
 
 		if (rx_info->page)
 			break;
 
 		ring_clean_tail_ptr++;
-		ring_index = ring_clean_tail_ptr & ring->size_mask;
+		ring_index = ring_clean_tail_ptr & rx_ring->size_mask;
 	}
 
 	// update ring tail
-	WRITE_ONCE(ring->clean_tail_ptr, ring_clean_tail_ptr);
+	WRITE_ONCE(rx_ring->clean_tail_ptr, ring_clean_tail_ptr);
 
 	// replenish buffers
-	mqnic_refill_rx_buffers(ring);
+	mqnic_refill_rx_buffers(rx_ring);
 
 	return done;
 }
diff --git a/modules/mqnic/mqnic_tx.c b/modules/mqnic/mqnic_tx.c
index 838be7fc4..44fcb8a62 100644
--- a/modules/mqnic/mqnic_tx.c
+++ b/modules/mqnic/mqnic_tx.c
@@ -224,7 +224,7 @@ int mqnic_free_tx_buf(struct mqnic_ring *ring)
 int mqnic_process_tx_cq(struct mqnic_cq_ring *cq_ring, int napi_budget)
 {
 	struct mqnic_priv *priv = cq_ring->priv;
-	struct mqnic_ring *ring = priv->tx_ring[cq_ring->ring_index];
+	struct mqnic_ring *tx_ring = priv->tx_ring[cq_ring->ring_index];
 	struct mqnic_tx_info *tx_info;
 	struct mqnic_cpl *cpl;
 	struct skb_shared_hwtstamps hwts;
@@ -241,7 +241,7 @@ int mqnic_process_tx_cq(struct mqnic_cq_ring *cq_ring, int napi_budget)
 		return done;
 
 	// prefetch for BQL
-	netdev_txq_bql_complete_prefetchw(ring->tx_queue);
+	netdev_txq_bql_complete_prefetchw(tx_ring->tx_queue);
 
 	// process completion queue
 	// read head pointer from NIC
@@ -252,17 +252,17 @@ int mqnic_process_tx_cq(struct mqnic_cq_ring *cq_ring, int napi_budget)
 
 	while (cq_ring->head_ptr != cq_tail_ptr && done < budget) {
 		cpl = (struct mqnic_cpl *)(cq_ring->buf + cq_index * cq_ring->stride);
-		ring_index = le16_to_cpu(cpl->index) & ring->size_mask;
-		tx_info = &ring->tx_info[ring_index];
+		ring_index = le16_to_cpu(cpl->index) & tx_ring->size_mask;
+		tx_info = &tx_ring->tx_info[ring_index];
 
 		// TX hardware timestamp
 		if (unlikely(tx_info->ts_requested)) {
 			dev_info(priv->dev, "%s: TX TS requested", __func__);
-			hwts.hwtstamp = mqnic_read_cpl_ts(priv->mdev, ring, cpl);
+			hwts.hwtstamp = mqnic_read_cpl_ts(priv->mdev, tx_ring, cpl);
 			skb_tstamp_tx(tx_info->skb, &hwts);
 		}
 		// free TX descriptor
-		mqnic_free_tx_desc(ring, ring_index, napi_budget);
+		mqnic_free_tx_desc(tx_ring, ring_index, napi_budget);
 
 		packets++;
 		bytes += le16_to_cpu(cpl->len);
@@ -279,30 +279,30 @@ int mqnic_process_tx_cq(struct mqnic_cq_ring *cq_ring, int napi_budget)
 
 	// process ring
 	// read tail pointer from NIC
-	mqnic_tx_read_tail_ptr(ring);
+	mqnic_tx_read_tail_ptr(tx_ring);
 
-	ring_clean_tail_ptr = READ_ONCE(ring->clean_tail_ptr);
-	ring_index = ring_clean_tail_ptr & ring->size_mask;
+	ring_clean_tail_ptr = READ_ONCE(tx_ring->clean_tail_ptr);
+	ring_index = ring_clean_tail_ptr & tx_ring->size_mask;
 
-	while (ring_clean_tail_ptr != ring->tail_ptr) {
-		tx_info = &ring->tx_info[ring_index];
+	while (ring_clean_tail_ptr != tx_ring->tail_ptr) {
+		tx_info = &tx_ring->tx_info[ring_index];
 
 		if (tx_info->skb)
 			break;
 
 		ring_clean_tail_ptr++;
-		ring_index = ring_clean_tail_ptr & ring->size_mask;
+		ring_index = ring_clean_tail_ptr & tx_ring->size_mask;
 	}
 
 	// update ring tail
-	WRITE_ONCE(ring->clean_tail_ptr, ring_clean_tail_ptr);
+	WRITE_ONCE(tx_ring->clean_tail_ptr, ring_clean_tail_ptr);
 
 	// BQL
-	//netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
+	//netdev_tx_completed_queue(tx_ring->tx_queue, packets, bytes);
 
 	// wake queue if it is stopped
-	if (netif_tx_queue_stopped(ring->tx_queue) && !mqnic_is_tx_ring_full(ring))
-		netif_tx_wake_queue(ring->tx_queue);
+	if (netif_tx_queue_stopped(tx_ring->tx_queue) && !mqnic_is_tx_ring_full(tx_ring))
+		netif_tx_wake_queue(tx_ring->tx_queue);
 
 	return done;
 }