Commit b83f28e1 authored by Björn Töpel's avatar Björn Töpel Committed by Jeff Kirsher
Browse files

i40e: move i40e_xsk_umem function 



The i40e_xsk_umem function was explicitly inlined in i40e.h. There is
no reason for that, so move it to i40e_main.c instead.

Signed-off-by: default avatarBjörn Töpel <bjorn.topel@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent b506bc97

drivers/net/ethernet/intel/i40e/i40e.h

+0 −14
Original line number Diff line number Diff line
@@ -1096,20 +1096,6 @@ static inline bool i40e_enabled_xdp_vsi(struct i40e_vsi *vsi) 
	return !!vsi->xdp_prog;

}



static inline struct xdp_umem *i40e_xsk_umem(struct i40e_ring *ring)

{

	bool xdp_on = i40e_enabled_xdp_vsi(ring->vsi);

	int qid = ring->queue_index;



	if (ring_is_xdp(ring))

		qid -= ring->vsi->alloc_queue_pairs;



	if (!xdp_on)

		return NULL;



	return xdp_get_umem_from_qid(ring->vsi->netdev, qid);

}



int i40e_create_queue_channel(struct i40e_vsi *vsi, struct i40e_channel *ch);

int i40e_set_bw_limit(struct i40e_vsi *vsi, u16 seid, u64 max_tx_rate);

int i40e_add_del_cloud_filter(struct i40e_vsi *vsi,

drivers/net/ethernet/intel/i40e/i40e_main.c

+20 −0
Original line number Diff line number Diff line
@@ -3063,6 +3063,26 @@ static void i40e_config_xps_tx_ring(struct i40e_ring *ring) 
			    ring->queue_index);

}



/**

 * i40e_xsk_umem - Retrieve the AF_XDP ZC if XDP and ZC is enabled

 * @ring: The Tx or Rx ring

 *

 * Returns the UMEM or NULL.

 **/

static struct xdp_umem *i40e_xsk_umem(struct i40e_ring *ring)

{

	bool xdp_on = i40e_enabled_xdp_vsi(ring->vsi);

	int qid = ring->queue_index;



	if (ring_is_xdp(ring))

		qid -= ring->vsi->alloc_queue_pairs;



	if (!xdp_on)

		return NULL;



	return xdp_get_umem_from_qid(ring->vsi->netdev, qid);

}



/**

 * i40e_configure_tx_ring - Configure a transmit ring context and rest

 * @ring: The Tx ring to configure

CRA Git | Maintained and supported by SUSTech CRA and CCSE