ice: remove unused definitions from ice_sriov.h

A few more macros exist in ice_sriov.h which are not used anywhere.
These can be safely removed. Note that ICE_VIRTCHNL_VF_CAP_L2 capability
is set but never checked anywhere in the driver. Thus it is also safe to
remove.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Konrad Jankowski <konrad0.jankowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c
index 8578317ceb8ac3f968c49f0f6f318081d7159d30..205d7e5003d88241a92572cac856858cf1caaa33 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_sriov.c
+++ b/drivers/net/ethernet/intel/ice/ice_sriov.c
@@ -2012,7 +2012,6 @@ static int ice_create_vf_entries(struct ice_pf *pf, u16 num_vfs)
 
                vf->vf_sw_id = pf->first_sw;
                /* assign default capabilities */
-               set_bit(ICE_VIRTCHNL_VF_CAP_L2, &vf->vf_caps);
                vf->spoofchk = true;
                vf->num_vf_qs = pf->vfs.num_qps_per;
                ice_vc_set_default_allowlist(vf);

diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.h b/drivers/net/ethernet/intel/ice/ice_sriov.h
index b6951d71859228b505f80490538b44569e91fafd..699690c1f6a0a7b1a586075a23882a2c7d5f7de3 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_sriov.h
+++ b/drivers/net/ethernet/intel/ice/ice_sriov.h
@@ -13,9 +13,6 @@
  */
 #define ICE_MAX_MACADDR_PER_VF         18
 
-/* Malicious Driver Detection */
-#define ICE_MDD_EVENTS_THRESHOLD               30
-
 /* Static VF transaction/status register def */
 #define VF_DEVICE_STATUS               0xAA
 #define VF_TRANS_PENDING_M             0x20
@@ -28,7 +25,6 @@
 #define ICE_MAX_VF_COUNT               256
 #define ICE_MIN_QS_PER_VF              1
 #define ICE_NONQ_VECS_VF               1
-#define ICE_MAX_SCATTER_QS_PER_VF      16
 #define ICE_MAX_RSS_QS_PER_VF          16
 #define ICE_NUM_VF_MSIX_MED            17
 #define ICE_NUM_VF_MSIX_SMALL          5
@@ -95,8 +91,7 @@ enum ice_vf_states {
 
 /* VF capabilities */
 enum ice_virtchnl_cap {
-       ICE_VIRTCHNL_VF_CAP_L2 = 0,
-       ICE_VIRTCHNL_VF_CAP_PRIVILEGE,
+       ICE_VIRTCHNL_VF_CAP_PRIVILEGE = 0,
 };
 
 struct ice_time_mac {