Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69b9a712 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

vmxnet3: remove unnecessary bookkeeping 



The uncommitted[] array was set but never used except in a debug
message. Remove it.

Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0d735f13

drivers/net/vmxnet3/vmxnet3_drv.c

+2 −7
Original line number Diff line number Diff line
@@ -628,12 +628,10 @@ vmxnet3_rq_alloc_rx_buf(struct vmxnet3_rx_queue *rq, u32 ring_idx, 
		num_allocated++;

		vmxnet3_cmd_ring_adv_next2fill(ring);

	}

	rq->uncommitted[ring_idx] += num_allocated;



	dev_dbg(&adapter->netdev->dev,

		"alloc_rx_buf: %d allocated, next2fill %u, next2comp "

		"%u, uncommitted %u\n", num_allocated, ring->next2fill,

		ring->next2comp, rq->uncommitted[ring_idx]);

		"alloc_rx_buf: %d allocated, next2fill %u, next2comp %u\n",

		num_allocated, ring->next2fill, ring->next2comp);



	/* so that the device can distinguish a full ring and an empty ring */

	BUG_ON(num_allocated != 0 && ring->next2fill == ring->next2comp);
@@ -1331,7 +1329,6 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq, 
			VMXNET3_WRITE_BAR0_REG(adapter,

					       rxprod_reg[ring_idx] + rq->qid * 8,

					       ring->next2fill);

			rq->uncommitted[ring_idx] = 0;

		}



		vmxnet3_comp_ring_adv_next2proc(&rq->comp_ring);
@@ -1376,7 +1373,6 @@ vmxnet3_rq_cleanup(struct vmxnet3_rx_queue *rq, 
		rq->rx_ring[ring_idx].gen = VMXNET3_INIT_GEN;

		rq->rx_ring[ring_idx].next2fill =

					rq->rx_ring[ring_idx].next2comp = 0;

		rq->uncommitted[ring_idx] = 0;

	}



	rq->comp_ring.gen = VMXNET3_INIT_GEN;
@@ -1457,7 +1453,6 @@ vmxnet3_rq_init(struct vmxnet3_rx_queue *rq, 
	/* reset internal state and allocate buffers for both rings */

	for (i = 0; i < 2; i++) {

		rq->rx_ring[i].next2fill = rq->rx_ring[i].next2comp = 0;

		rq->uncommitted[i] = 0;



		memset(rq->rx_ring[i].base, 0, rq->rx_ring[i].size *

		       sizeof(struct Vmxnet3_RxDesc));

drivers/net/vmxnet3/vmxnet3_int.h

+0 −2
Original line number Diff line number Diff line
@@ -276,8 +276,6 @@ struct vmxnet3_rx_queue { 
	struct vmxnet3_rx_ctx     rx_ctx;

	u32 qid;            /* rqID in RCD for buffer from 1st ring */

	u32 qid2;           /* rqID in RCD for buffer from 2nd ring */

	u32 uncommitted[2]; /* # of buffers allocated since last RXPROD

				* update */

	struct vmxnet3_rx_buf_info     *buf_info[2];

	struct Vmxnet3_RxQueueCtrl            *shared;

	struct vmxnet3_rq_driver_stats  stats;