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

Commit bab3a34b authored by Shannon Nelson's avatar Shannon Nelson Committed by Jeff Kirsher
Browse files

i40e: Code cleanup in i40e_add_fdir_ethtool 



A little bit of code cleanup in prep for more cloud filter work.

Change-ID: I0dc33ce0d4c207944336a07437640fef920c100c
Signed-off-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent c0913c2e

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

+7 −5
Original line number Diff line number Diff line
@@ -2506,7 +2506,6 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi, 


	if (!vsi)

		return -EINVAL;



	pf = vsi->back;



	if (!(pf->flags & I40E_FLAG_FD_SB_ENABLED))
@@ -2564,15 +2563,18 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi, 
	input->src_ip[0] = fsp->h_u.tcp_ip4_spec.ip4dst;



	if (ntohl(fsp->m_ext.data[1])) {

		if (ntohl(fsp->h_ext.data[1]) >= pf->num_alloc_vfs) {

			netif_info(pf, drv, vsi->netdev, "Invalid VF id\n");

		vf_id = ntohl(fsp->h_ext.data[1]);

		if (vf_id >= pf->num_alloc_vfs) {

			netif_info(pf, drv, vsi->netdev,

				   "Invalid VF id %d\n", vf_id);

			goto free_input;

		}

		vf_id = ntohl(fsp->h_ext.data[1]);

		/* Find vsi id from vf id and override dest vsi */

		input->dest_vsi = pf->vf[vf_id].lan_vsi_id;

		if (input->q_index >= pf->vf[vf_id].num_queue_pairs) {

			netif_info(pf, drv, vsi->netdev, "Invalid queue id\n");

			netif_info(pf, drv, vsi->netdev,

				   "Invalid queue id %d for VF %d\n",

				   input->q_index, vf_id);

			goto free_input;

		}

	}