diff options
| author | Matheos Worku <matheos.worku@sun.com> | 2007-12-14 11:48:29 -0800 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-12-14 16:12:47 -0500 |
| commit | 3fd7131feacc01c1e23e46c416228f36ebdcc0d4 (patch) | |
| tree | 6ba3067b7bc4c53a5865711faa60e246ee39fc5f | |
| parent | 470738758db2c209481fdf92ca09f60e690a62d3 (diff) | |
| download | linux-0-day-3fd7131feacc01c1e23e46c416228f36ebdcc0d4.tar.gz linux-0-day-3fd7131feacc01c1e23e46c416228f36ebdcc0d4.tar.xz | |
ixgb: make sure jumbos stay enabled after reset
Currently a device reset (ethtool -r ethX) would cause the
adapter to fall back to regular MTU sizes.
Signed-off-by: Matheos Worku <matheos.worku@sun.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index 3021234b1e173..bf9085fe035aa 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c @@ -320,10 +320,22 @@ ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog) void ixgb_reset(struct ixgb_adapter *adapter) { + struct ixgb_hw *hw = &adapter->hw; - ixgb_adapter_stop(&adapter->hw); - if(!ixgb_init_hw(&adapter->hw)) + ixgb_adapter_stop(hw); + if (!ixgb_init_hw(hw)) DPRINTK(PROBE, ERR, "ixgb_init_hw failed.\n"); + + /* restore frame size information */ + IXGB_WRITE_REG(hw, MFS, hw->max_frame_size << IXGB_MFS_SHIFT); + if (hw->max_frame_size > + IXGB_MAX_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH) { + u32 ctrl0 = IXGB_READ_REG(hw, CTRL0); + if (!(ctrl0 & IXGB_CTRL0_JFE)) { + ctrl0 |= IXGB_CTRL0_JFE; + IXGB_WRITE_REG(hw, CTRL0, ctrl0); + } + } } /** |