Commit 84a118ab authored by Dave Ertman's avatar Dave Ertman Committed by Jeff Kirsher
Browse files

ice: Rename ethtool private flag for lldp 



The current flag name of "enable-fw-lldp" is a bit cumbersome.

Change priv-flag name to "fw-lldp-agent" with a value of on or
off.  This is more straight-forward in meaning.

Signed-off-by: default avatarDave Ertman <david.m.ertman@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent f8af5bf5

drivers/net/ethernet/intel/ice/ice.h

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ enum ice_pf_flags { 
	ICE_FLAG_DCB_ENA,

	ICE_FLAG_LINK_DOWN_ON_CLOSE_ENA,

	ICE_FLAG_NO_MEDIA,

	ICE_FLAG_ENABLE_FW_LLDP,

	ICE_FLAG_FW_LLDP_AGENT,

	ICE_FLAG_ETHTOOL_CTXT,		/* set when ethtool holds RTNL lock */

	ICE_PF_FLAGS_NBITS		/* must be last */

};

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

+2 −2
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ int ice_init_pf_dcb(struct ice_pf *pf, bool locked) 
		dev_info(&pf->pdev->dev,

			 "FW LLDP is disabled, DCBx/LLDP in SW mode.\n");

		port_info->is_sw_lldp = true;

		clear_bit(ICE_FLAG_ENABLE_FW_LLDP, pf->flags);

		clear_bit(ICE_FLAG_FW_LLDP_AGENT, pf->flags);

		err = ice_dcb_sw_dflt_cfg(pf, locked);

		if (err) {

			dev_err(&pf->pdev->dev,
@@ -473,7 +473,7 @@ int ice_init_pf_dcb(struct ice_pf *pf, bool locked) 
	}



	port_info->is_sw_lldp = false;

	set_bit(ICE_FLAG_ENABLE_FW_LLDP, pf->flags);

	set_bit(ICE_FLAG_FW_LLDP_AGENT, pf->flags);



	/* DCBX in FW and LLDP enabled in FW */

	pf->dcbx_cap = DCB_CAP_DCBX_LLD_MANAGED | DCB_CAP_DCBX_VER_IEEE;

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

+3 −3
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ struct ice_priv_flag { 


static const struct ice_priv_flag ice_gstrings_priv_flags[] = {

	ICE_PRIV_FLAG("link-down-on-close", ICE_FLAG_LINK_DOWN_ON_CLOSE_ENA),

	ICE_PRIV_FLAG("enable-fw-lldp", ICE_FLAG_ENABLE_FW_LLDP),

	ICE_PRIV_FLAG("fw-lldp-agent", ICE_FLAG_FW_LLDP_AGENT),

};



#define ICE_PRIV_FLAG_ARRAY_SIZE	ARRAY_SIZE(ice_gstrings_priv_flags)
@@ -1201,8 +1201,8 @@ static int ice_set_priv_flags(struct net_device *netdev, u32 flags) 


	bitmap_xor(change_flags, pf->flags, orig_flags, ICE_PF_FLAGS_NBITS);



	if (test_bit(ICE_FLAG_ENABLE_FW_LLDP, change_flags)) {

		if (!test_bit(ICE_FLAG_ENABLE_FW_LLDP, pf->flags)) {

	if (test_bit(ICE_FLAG_FW_LLDP_AGENT, change_flags)) {

		if (!test_bit(ICE_FLAG_FW_LLDP_AGENT, pf->flags)) {

			enum ice_status status;



			/* Disable FW LLDP engine */

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

+2 −2
Original line number Diff line number Diff line
@@ -2541,7 +2541,7 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi, 
		ice_cfg_sw_lldp(vsi, true, true);



		/* Rx LLDP packets */

		if (!test_bit(ICE_FLAG_ENABLE_FW_LLDP, pf->flags))

		if (!test_bit(ICE_FLAG_FW_LLDP_AGENT, pf->flags))

			ice_cfg_sw_lldp(vsi, false, true);

	}
@@ -2888,7 +2888,7 @@ int ice_vsi_release(struct ice_vsi *vsi) 
		/* The Rx rule will only exist to remove if the LLDP FW

		 * engine is currently stopped

		 */

		if (!test_bit(ICE_FLAG_ENABLE_FW_LLDP, pf->flags))

		if (!test_bit(ICE_FLAG_FW_LLDP_AGENT, pf->flags))

			ice_cfg_sw_lldp(vsi, false, false);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE