Merge "net: rmnet_data: Add RXCSUM capability to netdevices" (69ab1ac6) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/tun.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -1112,7 +1112,8 @@ static ssize_t tun_get_user(struct tun_struct tun, struct tun_file tfile,
		kfree_skb(skb);
		return -EINVAL;
		}
		}
		} else if (tun->flags & TUN_NOCHECKSUM)
		skb->ip_summed = CHECKSUM_UNNECESSARY;

		switch (tun->flags & TUN_TYPE_MASK) {
		case TUN_TUN_DEV:
		@@ -1956,9 +1957,10 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
		case TUNSETNOCSUM:
		/* Disable/Enable checksum */

		/* [unimplemented] */
		tun_debug(KERN_INFO, tun, "ignored: set checksum %s\n",
		arg ? "disabled" : "enabled");
		if (arg)
		tun->flags \|= TUN_NOCHECKSUM;
		else
		tun->flags &= ~TUN_NOCHECKSUM;
		break;

		case TUNSETPERSIST:

+3 −1

Original line number	Diff line number	Diff line
		@@ -608,8 +608,10 @@ int rmnet_vnd_create_dev(int id, struct net_device **new_device,
		}

		if (!prefix) {
		/* Configuring DL checksum offload on rmnet_data interfaces */
		dev->hw_features = NETIF_F_RXCSUM;
		/* Configuring UL checksum offload on rmnet_data interfaces */
		dev->hw_features = NETIF_F_IP_CSUM \| NETIF_F_IPV6_CSUM \|
		dev->hw_features \|= NETIF_F_IP_CSUM \| NETIF_F_IPV6_CSUM \|
		NETIF_F_IPV6_UDP_CSUM;
		/* Configuring GRO on rmnet_data interfaces */
		dev->hw_features \|= NETIF_F_GRO;