[Patch 6/16 2.5] ixgb: fix error in setting Frame Size register while changing mtu

[Patch 6/16 2.5] ixgb: fix error in setting Frame Size register while changing mtu

[Ganesh Venkatesan]

diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c
--- net-drivers-2.6/drivers/net/ixgb/ixgb_main.c	2004-10-05 15:50:18.000000000 -0700
+++ net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c	2004-10-05 17:55:48.000000000 -0700
@@ -1437,8 +1437,8 @@ static struct net_device_stats *ixgb_get
 static int ixgb_change_mtu(struct net_device *netdev, int new_mtu)
 {
 	struct ixgb_adapter *adapter = netdev->priv;
-	uint32_t old_mtu = adapter->rx_buffer_len;
 	int max_frame = new_mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;
+	int old_max_frame = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;
 
 	if ((max_frame < IXGB_MIN_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH)
 	    || (max_frame > IXGB_MAX_JUMBO_FRAME_SIZE + ENET_FCS_LENGTH)) {
@@ -1463,7 +1477,7 @@ static int ixgb_change_mtu(struct net_de
 
 	netdev->mtu = new_mtu;
 
-	if (old_mtu != adapter->rx_buffer_len && netif_running(netdev)) {
+	if(old_max_frame != max_frame && netif_running(netdev)) {
 
 		ixgb_down(adapter, TRUE);
 		ixgb_up(adapter);

Re: [Patch 6/16 2.5] ixgb: fix error in setting Frame Size register while changing mtu

[Jeff Garzik]

patches 6 through 16 rejected because of the high likelihood of patch(1) 
rejects.

Please rediff the remaining patches (3, 4, 6-16) against a tree 
consisting of

* netdev-2.6 (info CC'd in an earlier email)
* ixgb patches 1, 2, and 5

Thanks,

	Jeff