commit 9a332461edee305c2ba8c163ca21d62670c6562b
author Linux Build Service Account <lnxbuild@quicinc.com> Tue Jun 27 14:34:45 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jun 27 14:34:45 2017 -0700
tree e0fa044539191c8c37feebdf42b7debe717421e5
parent c26e58256ad3d500ac594cdf5e8dd448653310d7
parent 24f80a003235c6fadf34294b9dd3334813b9736c

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

drivers/net/tun.c

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 4b7a363..35aa28b 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1276,6 +1276,10 @@
 		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

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index a47c29e..a9dcd27 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2831,6 +2831,8 @@
 	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

diff --git a/net/core/dev.c b/net/core/dev.c
index dff8012..2b12603 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4400,6 +4400,7 @@
 	}
 
 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

diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
index 14d0934..699c4e7 100644
--- a/net/core/net-procfs.c
+++ b/net/core/net-procfs.c
@@ -158,12 +158,12 @@
 	rcu_read_unlock();
 #endif
 
-	seq_printf(seq,
-		   "%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);
+	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->gro_coalesced);
 	return 0;
 }