Commit 0f030bdb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-Demote-MTU-change-prints-to-debug' 



Florian Fainelli says:

====================
net: Demote MTU change prints to debug

This patch series demotes several drivers that printed MTU change and
could therefore spam the kernel console if one has a test that it's all
about testing the values. Intel drivers were not also particularly
consistent in how they printed the same message, so now they are.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 693bd8b7 54093866

drivers/net/ethernet/intel/e1000/e1000_main.c

+2 −2
Original line number Diff line number Diff line
@@ -3565,8 +3565,8 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu) 
	     (max_frame == MAXIMUM_ETHERNET_VLAN_SIZE)))

		adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;



	pr_info("%s changing MTU from %d to %d\n",

		netdev->name, netdev->mtu, new_mtu);

	netdev_dbg(netdev, "changing MTU from %d to %d\n",

		   netdev->mtu, new_mtu);

	netdev->mtu = new_mtu;



	if (netif_running(netdev))

drivers/net/ethernet/intel/e1000e/netdev.c

+2 −1
Original line number Diff line number Diff line
@@ -6031,7 +6031,8 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu) 
		usleep_range(1000, 1100);

	/* 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_dbg(netdev, "changing MTU from %d to %d\n",

		   netdev->mtu, new_mtu);

	netdev->mtu = new_mtu;



	pm_runtime_get_sync(netdev->dev.parent);

drivers/net/ethernet/intel/i40e/i40e_main.c

+2 −2
Original line number Diff line number Diff line
@@ -2664,7 +2664,7 @@ static int i40e_change_mtu(struct net_device *netdev, int new_mtu) 
			return -EINVAL;

	}



	netdev_info(netdev, "changing MTU from %d to %d\n",

	netdev_dbg(netdev, "changing MTU from %d to %d\n",

		   netdev->mtu, new_mtu);

	netdev->mtu = new_mtu;

	if (netif_running(netdev))

drivers/net/ethernet/intel/igb/igb_main.c

+2 −3
Original line number Diff line number Diff line
@@ -6236,7 +6236,6 @@ static void igb_get_stats64(struct net_device *netdev, 
static int igb_change_mtu(struct net_device *netdev, int new_mtu)

{

	struct igb_adapter *adapter = netdev_priv(netdev);

	struct pci_dev *pdev = adapter->pdev;

	int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;



	/* adjust max frame to be at least the size of a standard frame */
@@ -6252,7 +6251,7 @@ static int igb_change_mtu(struct net_device *netdev, int new_mtu) 
	if (netif_running(netdev))

		igb_down(adapter);



	dev_info(&pdev->dev, "changing MTU from %d to %d\n",

	netdev_dbg(netdev, "changing MTU from %d to %d\n",

		   netdev->mtu, new_mtu);

	netdev->mtu = new_mtu;

drivers/net/ethernet/intel/igbvf/netdev.c

+2 −2
Original line number Diff line number Diff line
@@ -2437,7 +2437,7 @@ static int igbvf_change_mtu(struct net_device *netdev, int new_mtu) 
		adapter->rx_buffer_len = ETH_FRAME_LEN + VLAN_HLEN +

					 ETH_FCS_LEN;



	dev_info(&adapter->pdev->dev, "changing MTU from %d to %d\n",

	netdev_dbg(netdev, "changing MTU from %d to %d\n",

		   netdev->mtu, new_mtu);

	netdev->mtu = new_mtu;