summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2006-12-15 10:36:35 +0100
committerJeff Garzik <jeff@garzik.org>2006-12-26 15:51:30 -0500
commit83cd827977d8d20ac8c4fe56c88b53a70ac54af3 (patch)
tree83fae166069fb53e2702fe53f3ae59477b0cb557 /drivers
parentbb8e3311ef9de8e72f45f910e4a977c313c7009c (diff)
downloadop-kernel-dev-83cd827977d8d20ac8c4fe56c88b53a70ac54af3.zip
op-kernel-dev-83cd827977d8d20ac8c4fe56c88b53a70ac54af3.tar.gz
[PATCH] e1000: fix to set the new max frame size before resetting the adapter
This bugfix makes sure that the driver data reflects the full new situation before the adapter is reinitialized. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/e1000/e1000_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 343eb68..0d7c458 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3485,12 +3485,11 @@ e1000_change_mtu(struct net_device *netdev, int new_mtu)
adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
netdev->mtu = new_mtu;
+ adapter->hw.max_frame_size = max_frame;
if (netif_running(netdev))
e1000_reinit_locked(adapter);
- adapter->hw.max_frame_size = max_frame;
-
return 0;
}
OpenPOWER on IntegriCloud