From 45d5596bb2b411e63e4a26e28769a7a3cc4e1627 Mon Sep 17 00:00:00 2001 From: Mika Lansirinne Date: Fri, 16 Sep 2011 16:52:59 +0000 Subject: [PATCH] --- yaml --- r: 266429 b: refs/heads/master c: 860502bf68bae1ab126fe25a72d038c6e205dedd h: refs/heads/master i: 266427: db20eabffc602ce86edbf787ef1226e24b20ea97 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index fe847b3c1fcb..2a7d253fa2c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 837617a580d5b61ca7a0a0cfe74ba9276e94c0ed +refs/heads/master: 860502bf68bae1ab126fe25a72d038c6e205dedd diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c index db255fc37863..10ea29f66405 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c @@ -372,13 +372,7 @@ static void ixgbe_get_pauseparam(struct net_device *netdev, struct ixgbe_adapter *adapter = netdev_priv(netdev); struct ixgbe_hw *hw = &adapter->hw; - /* - * Flow Control Autoneg isn't on if - * - we didn't ask for it OR - * - it failed, we know this by tx & rx being off - */ - if (hw->fc.disable_fc_autoneg || - (hw->fc.current_mode == ixgbe_fc_none)) + if (hw->fc.disable_fc_autoneg) pause->autoneg = 0; else pause->autoneg = 1;