aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2006-12-15 04:36:35 -0500
committerJeff Garzik <jeff@garzik.org>2006-12-26 15:51:30 -0500
commit83cd827977d8d20ac8c4fe56c88b53a70ac54af3 (patch)
tree83fae166069fb53e2702fe53f3ae59477b0cb557
parentbb8e3311ef9de8e72f45f910e4a977c313c7009c (diff)
[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>
-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 343eb68fff73..0d7c458168d3 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)
3485 adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE; 3485 adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
3486 3486
3487 netdev->mtu = new_mtu; 3487 netdev->mtu = new_mtu;
3488 adapter->hw.max_frame_size = max_frame;
3488 3489
3489 if (netif_running(netdev)) 3490 if (netif_running(netdev))
3490 e1000_reinit_locked(adapter); 3491 e1000_reinit_locked(adapter);
3491 3492
3492 adapter->hw.max_frame_size = max_frame;
3493
3494 return 0; 3493 return 0;
3495} 3494}
3496 3495