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

Commit 9a332461 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "tun: Set CHECKSUM_UNNECESSARY if userspace passes this indication"

parents c26e5825 24f80a00

drivers/net/tun.c

+4 −0
Original line number Diff line number Diff line
@@ -1276,6 +1276,10 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, 
		return -EINVAL;

	}



	if (!(tun->flags & IFF_NO_PI))

		if (pi.flags & htons(CHECKSUM_UNNECESSARY))

			skb->ip_summed = CHECKSUM_UNNECESSARY;



	switch (tun->flags & TUN_TYPE_MASK) {

	case IFF_TUN:

		if (tun->flags & IFF_NO_PI) {

include/linux/netdevice.h

+2 −0
Original line number Diff line number Diff line
@@ -2831,6 +2831,8 @@ struct softnet_data { 
	unsigned int		processed;

	unsigned int		time_squeeze;

	unsigned int		received_rps;

	unsigned int            gro_coalesced;



#ifdef CONFIG_RPS

	struct softnet_data	*rps_ipi_list;

#endif

net/core/dev.c

+1 −0
Original line number Diff line number Diff line
@@ -4400,6 +4400,7 @@ static int napi_gro_complete(struct sk_buff *skb) 
	}



out:

	__this_cpu_add(softnet_data.gro_coalesced, NAPI_GRO_CB(skb)->count > 1);

	return netif_receive_skb_internal(skb);

}

net/core/net-procfs.c

+6 −6
Original line number Diff line number Diff line
@@ -158,12 +158,12 @@ static int softnet_seq_show(struct seq_file *seq, void *v) 
	rcu_read_unlock();

#endif



	seq_printf(seq,

		   "%08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x\n",

	seq_printf

	(seq, "%08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x\n",

	 sd->processed, sd->dropped, sd->time_squeeze, 0,

	 0, 0, 0, 0, /* was fastroute */

	 0, /* was cpu_collision */

		   sd->received_rps, flow_limit_count);

	 sd->received_rps, flow_limit_count, sd->gro_coalesced);

	return 0;

}