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

Commit a9124ec4 authored by Zhu Yanjun's avatar Zhu Yanjun Committed by David S. Miller
Browse files

forcedeth: remove duplicate structure member in rx 



Since both first_rx_ctx and rx_skb are the head of rx ctx, it not
necessary to use two structure members to statically indicate
the head of rx ctx. So first_rx_ctx is removed.

CC: Srinivas Eeda <srinivas.eeda@oracle.com>
CC: Joe Jin <joe.jin@oracle.com>
CC: Junxiao Bi <junxiao.bi@oracle.com>
Signed-off-by: default avatarZhu Yanjun <yanjun.zhu@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d7663275

drivers/net/ethernet/nvidia/forcedeth.c

+7 −6
Original line number Diff line number Diff line
@@ -795,7 +795,7 @@ struct fe_priv { 
	 */

	union ring_type get_rx, put_rx, last_rx;

	struct nv_skb_map *get_rx_ctx, *put_rx_ctx;

	struct nv_skb_map *first_rx_ctx, *last_rx_ctx;

	struct nv_skb_map *last_rx_ctx;

	struct nv_skb_map *rx_skb;



	union ring_type rx_ring;
@@ -1835,7 +1835,7 @@ static int nv_alloc_rx(struct net_device *dev) 
			if (unlikely(np->put_rx.orig++ == np->last_rx.orig))

				np->put_rx.orig = np->rx_ring.orig;

			if (unlikely(np->put_rx_ctx++ == np->last_rx_ctx))

				np->put_rx_ctx = np->first_rx_ctx;

				np->put_rx_ctx = np->rx_skb;

		} else {

packet_dropped:

			u64_stats_update_begin(&np->swstats_rx_syncp);
@@ -1877,7 +1877,7 @@ static int nv_alloc_rx_optimized(struct net_device *dev) 
			if (unlikely(np->put_rx.ex++ == np->last_rx.ex))

				np->put_rx.ex = np->rx_ring.ex;

			if (unlikely(np->put_rx_ctx++ == np->last_rx_ctx))

				np->put_rx_ctx = np->first_rx_ctx;

				np->put_rx_ctx = np->rx_skb;

		} else {

packet_dropped:

			u64_stats_update_begin(&np->swstats_rx_syncp);
@@ -1910,7 +1910,8 @@ static void nv_init_rx(struct net_device *dev) 
		np->last_rx.orig = &np->rx_ring.orig[np->rx_ring_size-1];

	else

		np->last_rx.ex = &np->rx_ring.ex[np->rx_ring_size-1];

	np->get_rx_ctx = np->put_rx_ctx = np->first_rx_ctx = np->rx_skb;

	np->get_rx_ctx = np->rx_skb;

	np->put_rx_ctx = np->rx_skb;

	np->last_rx_ctx = &np->rx_skb[np->rx_ring_size-1];



	for (i = 0; i < np->rx_ring_size; i++) {
@@ -2914,7 +2915,7 @@ static int nv_rx_process(struct net_device *dev, int limit) 
		if (unlikely(np->get_rx.orig++ == np->last_rx.orig))

			np->get_rx.orig = np->rx_ring.orig;

		if (unlikely(np->get_rx_ctx++ == np->last_rx_ctx))

			np->get_rx_ctx = np->first_rx_ctx;

			np->get_rx_ctx = np->rx_skb;



		rx_work++;

	}
@@ -3003,7 +3004,7 @@ static int nv_rx_process_optimized(struct net_device *dev, int limit) 
		if (unlikely(np->get_rx.ex++ == np->last_rx.ex))

			np->get_rx.ex = np->rx_ring.ex;

		if (unlikely(np->get_rx_ctx++ == np->last_rx_ctx))

			np->get_rx_ctx = np->first_rx_ctx;

			np->get_rx_ctx = np->rx_skb;



		rx_work++;

	}