Merge "Revert "net: tun: Implement TUN_NOCHECKSUM"" (ff8cb335) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/tun.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -1112,8 +1112,7 @@ 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;
		}

		if (!(tun->flags & TUN_NO_PI))
		if (pi.flags & htons(CHECKSUM_UNNECESSARY))
		@@ -1961,10 +1960,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
		case TUNSETNOCSUM:
		/* Disable/Enable checksum */

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

		case TUNSETPERSIST: