Commit 6f404e44 authored by Michał Mirosław's avatar Michał Mirosław Committed by David S. Miller
Browse files

net: Change netdev_fix_features messages loglevel 



Those reduced to DEBUG can possibly be triggered by unprivileged processes
and are nothing exceptional. Illegal checksum combinations can only be
caused by driver bug, so promote those messages to WARN.

Since GSO without SG will now only cause DEBUG message from
netdev_fix_features(), remove the workaround from register_netdevice().

Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ebde6f8a

net/core/dev.c

+8 −14
Original line number Diff line number Diff line
@@ -5186,27 +5186,27 @@ u32 netdev_fix_features(struct net_device *dev, u32 features) 
	/* Fix illegal checksum combinations */

	if ((features & NETIF_F_HW_CSUM) &&

	    (features & (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))) {

		netdev_info(dev, "mixed HW and IP checksum settings.\n");

		netdev_warn(dev, "mixed HW and IP checksum settings.\n");

		features &= ~(NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM);

	}



	if ((features & NETIF_F_NO_CSUM) &&

	    (features & (NETIF_F_HW_CSUM|NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))) {

		netdev_info(dev, "mixed no checksumming and other settings.\n");

		netdev_warn(dev, "mixed no checksumming and other settings.\n");

		features &= ~(NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM|NETIF_F_HW_CSUM);

	}



	/* Fix illegal SG+CSUM combinations. */

	if ((features & NETIF_F_SG) &&

	    !(features & NETIF_F_ALL_CSUM)) {

		netdev_info(dev,

		netdev_dbg(dev,

			"Dropping NETIF_F_SG since no checksum feature.\n");

		features &= ~NETIF_F_SG;

	}



	/* TSO requires that SG is present as well. */

	if ((features & NETIF_F_ALL_TSO) && !(features & NETIF_F_SG)) {

		netdev_info(dev, "Dropping TSO features since no SG feature.\n");

		netdev_dbg(dev, "Dropping TSO features since no SG feature.\n");

		features &= ~NETIF_F_ALL_TSO;

	}
@@ -5216,7 +5216,7 @@ u32 netdev_fix_features(struct net_device *dev, u32 features) 


	/* Software GSO depends on SG. */

	if ((features & NETIF_F_GSO) && !(features & NETIF_F_SG)) {

		netdev_info(dev, "Dropping NETIF_F_GSO since no SG feature.\n");

		netdev_dbg(dev, "Dropping NETIF_F_GSO since no SG feature.\n");

		features &= ~NETIF_F_GSO;

	}
@@ -5226,13 +5226,13 @@ u32 netdev_fix_features(struct net_device *dev, u32 features) 
		if (!((features & NETIF_F_GEN_CSUM) ||

		    (features & (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))

			    == (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))) {

			netdev_info(dev,

			netdev_dbg(dev,

				"Dropping NETIF_F_UFO since no checksum offload features.\n");

			features &= ~NETIF_F_UFO;

		}



		if (!(features & NETIF_F_SG)) {

			netdev_info(dev,

			netdev_dbg(dev,

				"Dropping NETIF_F_UFO since no NETIF_F_SG feature.\n");

			features &= ~NETIF_F_UFO;

		}
@@ -5414,12 +5414,6 @@ int register_netdevice(struct net_device *dev) 
	dev->features |= NETIF_F_SOFT_FEATURES;

	dev->wanted_features = dev->features & dev->hw_features;



	/* Avoid warning from netdev_fix_features() for GSO without SG */

	if (!(dev->wanted_features & NETIF_F_SG)) {

		dev->wanted_features &= ~NETIF_F_GSO;

		dev->features &= ~NETIF_F_GSO;

	}



	/* Enable GRO and NETIF_F_HIGHDMA for vlans by default,

	 * vlan_dev_init() will do the dev->features check, so these features

	 * are enabled only if supported by underlying device.

CRA Git | Maintained and supported by SUSTech CRA and CCSE