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

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

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

diff --cc net/ipv4/ip_output.c
index f2338e40c37d9512fc53310dd1c6b323cba6ea41,a2dfb5a9ba7698d193239f696d1f4d3dcc9732c4..95adb171f852d7c6e6ec964edd47c0bf74a6fbd2
--- 1/net/ipv4/ip_output.c
--- 2/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;