OSDN Git Service

ice: Remove CONFIG_PCI_IOV wrap in ice_set_pf_caps
authorAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Thu, 6 Feb 2020 09:20:04 +0000 (01:20 -0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 12 Feb 2020 19:48:31 +0000 (11:48 -0800)
Remove unnecessary CONFIG_PCI_IOV wrapping in ice_set_pf_caps. None
of the data structures accessed within the block are wrapped with
this flag. When CONFIG_PCI_IOV is undefined, pf->num_vfs_supported
will be 0 anyway.

Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ice/ice_main.c

index 4075d53..32fd3dc 100644 (file)
@@ -2665,14 +2665,12 @@ static void ice_set_pf_caps(struct ice_pf *pf)
        clear_bit(ICE_FLAG_DCB_CAPABLE, pf->flags);
        if (func_caps->common_cap.dcb)
                set_bit(ICE_FLAG_DCB_CAPABLE, pf->flags);
-#ifdef CONFIG_PCI_IOV
        clear_bit(ICE_FLAG_SRIOV_CAPABLE, pf->flags);
        if (func_caps->common_cap.sr_iov_1_1) {
                set_bit(ICE_FLAG_SRIOV_CAPABLE, pf->flags);
                pf->num_vfs_supported = min_t(int, func_caps->num_allocd_vfs,
                                              ICE_MAX_VF_COUNT);
        }
-#endif /* CONFIG_PCI_IOV */
        clear_bit(ICE_FLAG_RSS_ENA, pf->flags);
        if (func_caps->common_cap.rss_table_size)
                set_bit(ICE_FLAG_RSS_ENA, pf->flags);