[v2,24/36] net/i40e/base: make i40e_set_mac_type() public

Message ID 20191212152124.260629-25-xiaolong.ye@intel.com (mailing list archive)
State Changes Requested, archived
Delegated to: xiaolong ye
Series update for i40e base code |


Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail apply issues

Commit Message

Xiaolong Ye Dec. 12, 2019, 3:21 p.m. UTC
  Make i40e_set_mac_type() public. i40e driver requires i40e_set_mac_type()
to be public. It is required for recovery mode handling. Without this patch
recovery mode could not be detected at probe() function.

Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
 drivers/net/i40e/base/i40e_common.c    | 4 ----
 drivers/net/i40e/base/i40e_prototype.h | 2 --
 2 files changed, 6 deletions(-)


diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c
index eddc91e36..4f87ec9fa 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -14,11 +14,7 @@ 
  * This function sets the mac type of the adapter based on the
  * vendor ID and device ID stored in the hw structure.
-#if defined(INTEGRATED_VF) || defined(VF_DRIVER)
 enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw)
-STATIC enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw)
 	enum i40e_status_code status = I40E_SUCCESS;
diff --git a/drivers/net/i40e/base/i40e_prototype.h b/drivers/net/i40e/base/i40e_prototype.h
index afebf441d..2b6198985 100644
--- a/drivers/net/i40e/base/i40e_prototype.h
+++ b/drivers/net/i40e/base/i40e_prototype.h
@@ -472,10 +472,8 @@  void i40e_set_pci_config_data(struct i40e_hw *hw, u16 link_status);
 #endif /* PF_DRIVER */
 enum i40e_status_code i40e_enable_eee(struct i40e_hw *hw, bool enable);
-#if defined(I40E_QV) || defined(VF_DRIVER)
 enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw);
 extern struct i40e_rx_ptype_decoded i40e_ptype_lookup[];
 STATIC INLINE struct i40e_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype)