diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2016-12-02 15:22:58 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2016-12-02 15:22:58 +0000 |
| commit | 78026ddecf3c92c25272c1c81a2de1e65e68487c (patch) | |
| tree | d1f5bce60e6130bf2636b2bb6eefa5ed8c1e123d /sys | |
| parent | 61e7c9c2d648a72d7389f284c15503adf2d3d3dd (diff) | |
Don't overwrite the selected flow control settings
procter@ has noticed that flow control settings survive module change
when they should be forgotten. It became clear that we're overwriting
the selected FC mode with the requested version instead of keeping
negotiated settings. Tested by procter@.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/ixgbe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/ixgbe.c b/sys/dev/pci/ixgbe.c index 0b0e19083db..7c83e0a0865 100644 --- a/sys/dev/pci/ixgbe.c +++ b/sys/dev/pci/ixgbe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ixgbe.c,v 1.22 2016/11/24 17:39:49 mikeb Exp $ */ +/* $OpenBSD: ixgbe.c,v 1.23 2016/12/02 15:22:57 mikeb Exp $ */ /****************************************************************************** @@ -2530,9 +2530,9 @@ void ixgbe_fc_autoneg(struct ixgbe_hw *hw) out: if (ret_val == IXGBE_SUCCESS) { hw->fc.fc_was_autonegged = TRUE; - hw->fc.current_mode = hw->fc.requested_mode; } else { hw->fc.fc_was_autonegged = FALSE; + hw->fc.current_mode = hw->fc.requested_mode; } } |