diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-08 06:56:32 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-08 06:56:32 +0300 |
| commit | 62515f95b45818ddd925569504fe52f4afd3eb7a (patch) | |
| tree | d12c866b158b3e36801e4039221829edad0a0b7f /net/ipv4/ip_output.c | |
| parent | 9d4927f0d3760d8f10727c3035121d2677108f44 (diff) | |
| parent | 565f0fa902b64020d5d147ff1708567e9e0b6e49 (diff) | |
| download | linux-62515f95b45818ddd925569504fe52f4afd3eb7a.tar.xz | |
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>
Diffstat (limited to 'net/ipv4/ip_output.c')
| -rw-r--r-- | net/ipv4/ip_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index f2338e40c37d..95adb171f852 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -910,7 +910,7 @@ static int __ip_append_data(struct sock *sk, length + fragheaderlen <= mtu && rt->dst.dev->features & (NETIF_F_HW_CSUM | NETIF_F_IP_CSUM) && (!(flags & MSG_MORE) || cork->gso_size) && - !exthdrlen) + (!exthdrlen || (rt->dst.dev->features & NETIF_F_HW_ESP_TX_CSUM))) csummode = CHECKSUM_PARTIAL; cork->length += length; |