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

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

net: Move check of checksum features to netdev_fix_features() 



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

net/core/dev.c

+17 −15
Original line number Diff line number Diff line
@@ -5215,6 +5215,23 @@ static void rollback_registered(struct net_device *dev) 


unsigned long netdev_fix_features(unsigned long features, const char *name)

{

	/* Fix illegal checksum combinations */

	if ((features & NETIF_F_HW_CSUM) &&

	    (features & (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))) {

		if (name)

			printk(KERN_NOTICE "%s: mixed HW and IP checksum settings.\n",

				name);

		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))) {

		if (name)

			printk(KERN_NOTICE "%s: mixed no checksumming and other settings.\n",

				name);

		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)) {
@@ -5390,21 +5407,6 @@ int register_netdevice(struct net_device *dev) 
	if (dev->iflink == -1)

		dev->iflink = dev->ifindex;



	/* Fix illegal checksum combinations */

	if ((dev->features & NETIF_F_HW_CSUM) &&

	    (dev->features & (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))) {

		printk(KERN_NOTICE "%s: mixed HW and IP checksum settings.\n",

		       dev->name);

		dev->features &= ~(NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM);

	}



	if ((dev->features & NETIF_F_NO_CSUM) &&

	    (dev->features & (NETIF_F_HW_CSUM|NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))) {

		printk(KERN_NOTICE "%s: mixed no checksumming and other settings.\n",

		       dev->name);

		dev->features &= ~(NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM|NETIF_F_HW_CSUM);

	}



	dev->features = netdev_fix_features(dev->features, dev->name);



	/* Enable software GSO if SG is supported. */