Commit 8cf52bec authored by Jacob Keller's avatar Jacob Keller Committed by Tony Nguyen
Browse files

ice: cleanup long lines in ice_sriov.c 



Before we move the virtchnl message handling from ice_sriov.c into
ice_virtchnl.c, cleanup some long line warnings to avoid checkpatch.pl
complaints.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarKonrad Jankowski <konrad0.jankowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent f5f085c0

drivers/net/ethernet/intel/ice/ice_sriov.c

+27 −12
Original line number Diff line number Diff line
@@ -2325,16 +2325,21 @@ static int ice_vc_cfg_promiscuous_mode_msg(struct ice_vf *vf, u8 *msg) 
		    !test_and_set_bit(ICE_VF_STATE_MC_PROMISC, vf->vf_states))

			dev_info(dev, "VF %u successfully set multicast promiscuous mode\n",

				 vf->vf_id);

		else if (!allmulti && test_and_clear_bit(ICE_VF_STATE_MC_PROMISC, vf->vf_states))

		else if (!allmulti &&

			 test_and_clear_bit(ICE_VF_STATE_MC_PROMISC,

					    vf->vf_states))

			dev_info(dev, "VF %u successfully unset multicast promiscuous mode\n",

				 vf->vf_id);

	}



	if (!ucast_err) {

		if (alluni && !test_and_set_bit(ICE_VF_STATE_UC_PROMISC, vf->vf_states))

		if (alluni &&

		    !test_and_set_bit(ICE_VF_STATE_UC_PROMISC, vf->vf_states))

			dev_info(dev, "VF %u successfully set unicast promiscuous mode\n",

				 vf->vf_id);

		else if (!alluni && test_and_clear_bit(ICE_VF_STATE_UC_PROMISC, vf->vf_states))

		else if (!alluni &&

			 test_and_clear_bit(ICE_VF_STATE_UC_PROMISC,

					    vf->vf_states))

			dev_info(dev, "VF %u successfully unset unicast promiscuous mode\n",

				 vf->vf_id);

	}
@@ -2878,8 +2883,9 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg) 
			}



			vsi->max_frame = qpi->rxq.max_pkt_size;

			/* add space for the port VLAN since the VF driver is not

			 * expected to account for it in the MTU calculation

			/* add space for the port VLAN since the VF driver is

			 * not expected to account for it in the MTU

			 * calculation

			 */

			if (ice_vf_is_port_vlan_ena(vf))

				vsi->max_frame += VLAN_HLEN;
@@ -3665,8 +3671,11 @@ static u16 ice_vc_get_max_vlan_fltrs(struct ice_vf *vf) 
}



/**

 * ice_vf_outer_vlan_not_allowed - check outer VLAN can be used when the device is in DVM

 * ice_vf_outer_vlan_not_allowed - check if outer VLAN can be used

 * @vf: VF that being checked for

 *

 * When the device is in double VLAN mode, check whether or not the outer VLAN

 * is allowed.

 */

static bool ice_vf_outer_vlan_not_allowed(struct ice_vf *vf)

{
@@ -3944,9 +3953,11 @@ ice_vc_validate_vlan_filter_list(struct virtchnl_vlan_filtering_caps *vfc, 
			return false;



		if ((ice_vc_is_valid_vlan(outer) &&

		     !ice_vc_validate_vlan_tpid(filtering_support->outer, outer->tpid)) ||

		     !ice_vc_validate_vlan_tpid(filtering_support->outer,

						outer->tpid)) ||

		    (ice_vc_is_valid_vlan(inner) &&

		     !ice_vc_validate_vlan_tpid(filtering_support->inner, inner->tpid)))

		     !ice_vc_validate_vlan_tpid(filtering_support->inner,

						inner->tpid)))

			return false;

	}
@@ -4421,7 +4432,8 @@ static int ice_vc_ena_vlan_stripping_v2_msg(struct ice_vf *vf, u8 *msg) 
	}



out:

	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_ENABLE_VLAN_STRIPPING_V2, v_ret, NULL, 0);

	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_ENABLE_VLAN_STRIPPING_V2,

				     v_ret, NULL, 0);

}



/**
@@ -4490,7 +4502,8 @@ static int ice_vc_dis_vlan_stripping_v2_msg(struct ice_vf *vf, u8 *msg) 
	}



out:

	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_DISABLE_VLAN_STRIPPING_V2, v_ret, NULL, 0);

	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_DISABLE_VLAN_STRIPPING_V2,

				     v_ret, NULL, 0);

}



/**
@@ -4548,7 +4561,8 @@ static int ice_vc_ena_vlan_insertion_v2_msg(struct ice_vf *vf, u8 *msg) 
	}



out:

	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_ENABLE_VLAN_INSERTION_V2, v_ret, NULL, 0);

	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_ENABLE_VLAN_INSERTION_V2,

				     v_ret, NULL, 0);

}



/**
@@ -4602,7 +4616,8 @@ static int ice_vc_dis_vlan_insertion_v2_msg(struct ice_vf *vf, u8 *msg) 
	}



out:

	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_DISABLE_VLAN_INSERTION_V2, v_ret, NULL, 0);

	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_DISABLE_VLAN_INSERTION_V2,

				     v_ret, NULL, 0);

}



static const struct ice_virtchnl_ops ice_virtchnl_dflt_ops = {