tun/tap: Remove references to NETIF_F_UFO. (d591a1f3) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/net/tap.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -943,9 +943,6 @@ static int set_offload(struct tap_queue *q, unsigned long arg)
		if (arg & TUN_F_TSO6)
		feature_mask \|= NETIF_F_TSO6;
		}

		if (arg & TUN_F_UFO)
		feature_mask \|= NETIF_F_UFO;
		}

		/* tun/tap driver inverts the usage for TSO offloads, where
		@@ -956,7 +953,7 @@ static int set_offload(struct tap_queue *q, unsigned long arg)
		* When user space turns off TSO, we turn off GSO/LRO so that
		* user-space will not receive TSO frames.
		*/
		if (feature_mask & (NETIF_F_TSO \| NETIF_F_TSO6 \| NETIF_F_UFO))
		if (feature_mask & (NETIF_F_TSO \| NETIF_F_TSO6))
		features \|= RX_OFFLOADS;
		else
		features &= ~RX_OFFLOADS;
		@@ -1078,7 +1075,7 @@ static long tap_ioctl(struct file *file, unsigned int cmd,
		case TUNSETOFFLOAD:
		/* let the user check for future flags */
		if (arg & ~(TUN_F_CSUM \| TUN_F_TSO4 \| TUN_F_TSO6 \|
		TUN_F_TSO_ECN \| TUN_F_UFO))
		TUN_F_TSO_ECN))
		return -EINVAL;

		rtnl_lock();

+1 −6

Original line number	Diff line number	Diff line
		@@ -199,7 +199,7 @@ struct tun_struct {
		struct net_device *dev;
		netdev_features_t set_features;
		#define TUN_USER_FEATURES (NETIF_F_HW_CSUM\|NETIF_F_TSO_ECN\|NETIF_F_TSO\| \
		NETIF_F_TSO6\|NETIF_F_UFO)
		NETIF_F_TSO6)

		int align;
		int vnet_hdr_sz;
		@@ -1921,11 +1921,6 @@ static int set_offload(struct tun_struct *tun, unsigned long arg)
		features \|= NETIF_F_TSO6;
		arg &= ~(TUN_F_TSO4\|TUN_F_TSO6);
		}

		if (arg & TUN_F_UFO) {
		features \|= NETIF_F_UFO;
		arg &= ~TUN_F_UFO;
		}
		}

		/* This gives the user a way to test for new features in future by