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

Commit cf97050d authored by Tariq Toukan's avatar Tariq Toukan Committed by David S. Miller
Browse files

net/mlx4_en: Remove unused argument in TX datapath function 



Remove owner argument, as it is obsolete and unused.
This also saves the overhead of calculating its value in data-path.

Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Reviewed-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Cc: kernel-team@fb.com
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1492a3a7

drivers/net/ethernet/mellanox/mlx4/en_tx.c

+4 −6
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static void mlx4_en_stamp_wqe(struct mlx4_en_priv *priv, 


u32 mlx4_en_free_tx_desc(struct mlx4_en_priv *priv,

			 struct mlx4_en_tx_ring *ring,

			 int index, u8 owner, u64 timestamp,

			 int index, u64 timestamp,

			 int napi_mode)

{

	struct mlx4_en_tx_info *tx_info = &ring->tx_info[index];
@@ -344,7 +344,7 @@ u32 mlx4_en_free_tx_desc(struct mlx4_en_priv *priv, 


u32 mlx4_en_recycle_tx_desc(struct mlx4_en_priv *priv,

			    struct mlx4_en_tx_ring *ring,

			    int index, u8 owner, u64 timestamp,

			    int index, u64 timestamp,

			    int napi_mode)

{

	struct mlx4_en_tx_info *tx_info = &ring->tx_info[index];
@@ -381,8 +381,7 @@ int mlx4_en_free_tx_buf(struct net_device *dev, struct mlx4_en_tx_ring *ring) 
	while (ring->cons != ring->prod) {

		ring->last_nr_txbb = ring->free_tx_desc(priv, ring,

						ring->cons & ring->size_mask,

						!!(ring->cons & ring->size), 0,

						0 /* Non-NAPI caller */);

						0, 0 /* Non-NAPI caller */);

		ring->cons += ring->last_nr_txbb;

		cnt++;

	}
@@ -464,8 +463,7 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev, 
			/* free next descriptor */

			last_nr_txbb = ring->free_tx_desc(

					priv, ring, ring_index,

					!!((ring_cons + txbbs_skipped) &

					ring->size), timestamp, napi_budget);

					timestamp, napi_budget);



			mlx4_en_stamp_wqe(priv, ring, stamp_index,

					  !!((ring_cons + txbbs_stamp) &

drivers/net/ethernet/mellanox/mlx4/mlx4_en.h

+3 −3
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ struct mlx4_en_tx_ring { 
	struct netdev_queue	*tx_queue;

	u32			(*free_tx_desc)(struct mlx4_en_priv *priv,

						struct mlx4_en_tx_ring *ring,

						int index, u8 owner,

						int index,

						u64 timestamp, int napi_mode);

	struct mlx4_en_rx_ring	*recycle_ring;
@@ -723,11 +723,11 @@ int mlx4_en_poll_rx_cq(struct napi_struct *napi, int budget); 
int mlx4_en_poll_tx_cq(struct napi_struct *napi, int budget);

u32 mlx4_en_free_tx_desc(struct mlx4_en_priv *priv,

			 struct mlx4_en_tx_ring *ring,

			 int index, u8 owner, u64 timestamp,

			 int index, u64 timestamp,

			 int napi_mode);

u32 mlx4_en_recycle_tx_desc(struct mlx4_en_priv *priv,

			    struct mlx4_en_tx_ring *ring,

			    int index, u8 owner, u64 timestamp,

			    int index, u64 timestamp,

			    int napi_mode);

void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride,

		int is_tx, int rss, int qpn, int cqn, int user_prio,