aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/netdev.c
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2008-11-21 19:57:36 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-21 19:57:36 -0500
commit5c48ef3e2028677a890d46d9a38b19174274f2e9 (patch)
tree1ef4a75e9054eafa127609bd31f7999dc1fe085f /drivers/net/e1000e/netdev.c
parent8f12fe8653eb699a6bc4f88f1a80312466ea2b0e (diff)
e1000e: sync change flow control variables with ixgbe
Sync flow control variables and usage model with that found in the ixgbe driver. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r--drivers/net/e1000e/netdev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index cd6d132160c..f10252b055d 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -2785,7 +2785,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
2785 else 2785 else
2786 fc->pause_time = E1000_FC_PAUSE_TIME; 2786 fc->pause_time = E1000_FC_PAUSE_TIME;
2787 fc->send_xon = 1; 2787 fc->send_xon = 1;
2788 fc->type = fc->original_type; 2788 fc->current_mode = fc->requested_mode;
2789 2789
2790 /* Allow time for pending master requests to run */ 2790 /* Allow time for pending master requests to run */
2791 mac->ops.reset_hw(hw); 2791 mac->ops.reset_hw(hw);
@@ -4983,8 +4983,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
4983 /* Initialize link parameters. User can change them with ethtool */ 4983 /* Initialize link parameters. User can change them with ethtool */
4984 adapter->hw.mac.autoneg = 1; 4984 adapter->hw.mac.autoneg = 1;
4985 adapter->fc_autoneg = 1; 4985 adapter->fc_autoneg = 1;
4986 adapter->hw.fc.original_type = e1000_fc_default; 4986 adapter->hw.fc.requested_mode = e1000_fc_default;
4987 adapter->hw.fc.type = e1000_fc_default; 4987 adapter->hw.fc.current_mode = e1000_fc_default;
4988 adapter->hw.phy.autoneg_advertised = 0x2f; 4988 adapter->hw.phy.autoneg_advertised = 0x2f;
4989 4989
4990 /* ring size defaults */ 4990 /* ring size defaults */