From: David S. Miller <davem@davemloft.net>
Date: Tue, 8 May 2018 03:56:32 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec... 
X-Git-Tag: v5.4.17~5893^2~299
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=62515f95b45818ddd925569504fe52f4afd3eb7a;p=arm%2Flinux.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

Minor conflict in ip_output.c, overlapping changes to
the body of an if() statement.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

62515f95b45818ddd925569504fe52f4afd3eb7a
diff --cc net/ipv4/ip_output.c
index f2338e40c37d,a2dfb5a9ba76..95adb171f852
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@@ -909,8 -906,8 +909,8 @@@ static int __ip_append_data(struct soc
  	if (transhdrlen &&
  	    length + fragheaderlen <= mtu &&
  	    rt->dst.dev->features & (NETIF_F_HW_CSUM | NETIF_F_IP_CSUM) &&
 -	    !(flags & MSG_MORE) &&
 +	    (!(flags & MSG_MORE) || cork->gso_size) &&
- 	    !exthdrlen)
+ 	    (!exthdrlen || (rt->dst.dev->features & NETIF_F_HW_ESP_TX_CSUM)))
  		csummode = CHECKSUM_PARTIAL;
  
  	cork->length += length;