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

Commit 9c83b070 authored by Ayyappan Veeraiyan's avatar Ayyappan Veeraiyan Committed by Jeff Garzik
Browse files

ixgbe: Fix pause code for ethtool 



Signed-off-by: default avatarAyyappan Veeraiyan <ayyappan.veeraiyan@intel.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 735441fb

drivers/net/ixgbe/ixgbe_ethtool.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -167,7 +167,7 @@ static void ixgbe_get_pauseparam(struct net_device *netdev, 
	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_hw *hw = &adapter->hw;

	struct ixgbe_hw *hw = &adapter->hw;





	pause->autoneg = AUTONEG_DISABLE;

	pause->autoneg = (hw->fc.type == ixgbe_fc_full ? 1 : 0);





	if (hw->fc.type == ixgbe_fc_rx_pause) {

	if (hw->fc.type == ixgbe_fc_rx_pause) {

		pause->rx_pause = 1;

		pause->rx_pause = 1;
@@ -185,10 +185,8 @@ static int ixgbe_set_pauseparam(struct net_device *netdev, 
	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_hw *hw = &adapter->hw;

	struct ixgbe_hw *hw = &adapter->hw;





	if (pause->autoneg == AUTONEG_ENABLE)

	if ((pause->autoneg == AUTONEG_ENABLE) ||

		return -EINVAL;

	    (pause->rx_pause && pause->tx_pause))



	if (pause->rx_pause && pause->tx_pause)

		hw->fc.type = ixgbe_fc_full;

		hw->fc.type = ixgbe_fc_full;

	else if (pause->rx_pause && !pause->tx_pause)

	else if (pause->rx_pause && !pause->tx_pause)

		hw->fc.type = ixgbe_fc_rx_pause;

		hw->fc.type = ixgbe_fc_rx_pause;
@@ -196,6 +194,8 @@ static int ixgbe_set_pauseparam(struct net_device *netdev, 
		hw->fc.type = ixgbe_fc_tx_pause;

		hw->fc.type = ixgbe_fc_tx_pause;

	else if (!pause->rx_pause && !pause->tx_pause)

	else if (!pause->rx_pause && !pause->tx_pause)

		hw->fc.type = ixgbe_fc_none;

		hw->fc.type = ixgbe_fc_none;

	else

		return -EINVAL;





	hw->fc.original_type = hw->fc.type;

	hw->fc.original_type = hw->fc.type;