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

Commit a6599721 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

i40e: move nway reset 



Just move nway reset up, will be used in the next patch.

Change-ID: Ice3b631fa2044debc5c4541b42872a48163f8452
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarJim Young <jamesx.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 8109e123

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

+19 −19
Original line number Diff line number Diff line
@@ -412,6 +412,25 @@ static int i40e_get_settings(struct net_device *netdev, 
	return 0;

}



static int i40e_nway_reset(struct net_device *netdev)

{

	/* restart autonegotiation */

	struct i40e_netdev_priv *np = netdev_priv(netdev);

	struct i40e_pf *pf = np->vsi->back;

	struct i40e_hw *hw = &pf->hw;

	bool link_up = hw->phy.link_info.link_info & I40E_AQ_LINK_UP;

	i40e_status ret = 0;



	ret = i40e_aq_set_link_restart_an(hw, link_up, NULL);

	if (ret) {

		netdev_info(netdev, "link restart failed, aq_err=%d\n",

			    pf->hw.aq.asq_last_status);

		return -EIO;

	}



	return 0;

}



/**

 * i40e_get_pauseparam -  Get Flow Control status

 * Return tx/rx-pause status
@@ -1125,25 +1144,6 @@ static int i40e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 
	return 0;

}



static int i40e_nway_reset(struct net_device *netdev)

{

	/* restart autonegotiation */

	struct i40e_netdev_priv *np = netdev_priv(netdev);

	struct i40e_pf *pf = np->vsi->back;

	struct i40e_hw *hw = &pf->hw;

	bool link_up = hw->phy.link_info.link_info & I40E_AQ_LINK_UP;

	i40e_status ret = 0;



	ret = i40e_aq_set_link_restart_an(hw, link_up, NULL);

	if (ret) {

		netdev_info(netdev, "link restart failed, aq_err=%d\n",

			    pf->hw.aq.asq_last_status);

		return -EIO;

	}



	return 0;

}



static int i40e_set_phys_id(struct net_device *netdev,

			    enum ethtool_phys_id_state state)

{