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

Commit 6de432c5 authored by Bimmy Pujari's avatar Bimmy Pujari Committed by Jeff Kirsher
Browse files

i40e: Deprecating unused macro 



I40E_MAC_X710 was supposed to be for 10G and I40E_MAC_XL710
was supposed to be for 40G. But function i40e_is_mac_710
sets I40E_MAC_XL710 for all device IDS, I40E_MAC_X710 is not
used at all. As there is nothing to compare there is no need
for this function. Thus deprecating this extra macro and
removing this function entirely and replacing it with a direct
check.

Change-ID: I7d1769954dccd574a290ac04adb836ebd156730e
Signed-off-by: default avatarBimmy Pujari <bimmy.pujari@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 9569a9a4

drivers/net/ethernet/intel/i40e/i40e.h

+0 −13
Original line number Diff line number Diff line
@@ -134,19 +134,6 @@ 
/* default to trying for four seconds */

#define I40E_TRY_LINK_TIMEOUT	(4 * HZ)



/**

 * i40e_is_mac_710 - Return true if MAC is X710/XL710

 * @hw: ptr to the hardware info

 **/

static inline bool i40e_is_mac_710(struct i40e_hw *hw)

{

	if ((hw->mac.type == I40E_MAC_X710) ||

	    (hw->mac.type == I40E_MAC_XL710))

		return true;



	return false;

}



/* driver state flags */

enum i40e_state_t {

	__I40E_TESTING,

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

+3 −3
Original line number Diff line number Diff line
@@ -8684,7 +8684,7 @@ static int i40e_sw_init(struct i40e_pf *pf) 
				 pf->hw.func_caps.fd_filters_best_effort;

	}



	if (i40e_is_mac_710(&pf->hw) &&

	if ((pf->hw.mac.type == I40E_MAC_XL710) &&

	    (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver < 33)) ||

	    (pf->hw.aq.fw_maj_ver < 4))) {

		pf->flags |= I40E_FLAG_RESTART_AUTONEG;
@@ -8693,13 +8693,13 @@ static int i40e_sw_init(struct i40e_pf *pf) 
	}



	/* Disable FW LLDP if FW < v4.3 */

	if (i40e_is_mac_710(&pf->hw) &&

	if ((pf->hw.mac.type == I40E_MAC_XL710) &&

	    (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver < 3)) ||

	    (pf->hw.aq.fw_maj_ver < 4)))

		pf->flags |= I40E_FLAG_STOP_FW_LLDP;



	/* Use the FW Set LLDP MIB API if FW > v4.40 */

	if (i40e_is_mac_710(&pf->hw) &&

	if ((pf->hw.mac.type == I40E_MAC_XL710) &&

	    (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver >= 40)) ||

	    (pf->hw.aq.fw_maj_ver >= 5)))

		pf->flags |= I40E_FLAG_USE_SET_LLDP_MIB;

drivers/net/ethernet/intel/i40e/i40e_type.h

+0 −1
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ enum i40e_debug_mask { 
 */

enum i40e_mac_type {

	I40E_MAC_UNKNOWN = 0,

	I40E_MAC_X710,

	I40E_MAC_XL710,

	I40E_MAC_VF,

	I40E_MAC_X722,

drivers/net/ethernet/intel/i40evf/i40e_type.h

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ enum i40e_debug_mask { 
 */

enum i40e_mac_type {

	I40E_MAC_UNKNOWN = 0,

	I40E_MAC_X710,

	I40E_MAC_XL710,

	I40E_MAC_VF,

	I40E_MAC_X722,