Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 610c9928 authored by Bruce Allan's avatar Bruce Allan Committed by David S. Miller
Browse files

e1000e: flow control thresholds not correct when changing mtu 



When changing MTU, save it off prior to resetting otherwise the flow control
thresholds may be miscalculated.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4c86e0b9

drivers/net/e1000e/netdev.c

+3 −4
Original line number Diff line number Diff line
@@ -4305,8 +4305,10 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu) 


	while (test_and_set_bit(__E1000_RESETTING, &adapter->state))

		msleep(1);

	/* e1000e_down has a dependency on max_frame_size */

	/* e1000e_down -> e1000e_reset dependent on max_frame_size & mtu */

	adapter->max_frame_size = max_frame;

	e_info("changing MTU from %d to %d\n", netdev->mtu, new_mtu);

	netdev->mtu = new_mtu;

	if (netif_running(netdev))

		e1000e_down(adapter);
@@ -4336,9 +4338,6 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu) 
		adapter->rx_buffer_len = ETH_FRAME_LEN + VLAN_HLEN

					 + ETH_FCS_LEN;



	e_info("changing MTU from %d to %d\n", netdev->mtu, new_mtu);

	netdev->mtu = new_mtu;



	if (netif_running(netdev))

		e1000e_up(adapter);

	else