diff options
author | Boris Pismenny <borisp@mellanox.com> | 2018-07-13 13:33:38 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-07-16 09:12:09 +0200 |
commit | 41ed9c04aac2f8c6ee922e29ce5e69f185c5125b (patch) | |
tree | 8c2b86753dc8762924abd6a39c2d36476b0bd183 /net/ipv4/tcp_offload.c | |
parent | net: Add TLS rx resync NDO (diff) | |
download | linux-41ed9c04aac2f8c6ee922e29ce5e69f185c5125b.tar.xz linux-41ed9c04aac2f8c6ee922e29ce5e69f185c5125b.zip |
tcp: Don't coalesce decrypted and encrypted SKBs
Prevent coalescing of decrypted and encrypted SKBs in GRO
and TCP layer.
Signed-off-by: Boris Pismenny <borisp@mellanox.com>
Signed-off-by: Ilya Lesokhin <ilyal@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_offload.c')
-rw-r--r-- | net/ipv4/tcp_offload.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/tcp_offload.c b/net/ipv4/tcp_offload.c index f5aee641f825..870b0a335061 100644 --- a/net/ipv4/tcp_offload.c +++ b/net/ipv4/tcp_offload.c @@ -262,6 +262,9 @@ found: flush |= (len - 1) >= mss; flush |= (ntohl(th2->seq) + skb_gro_len(p)) ^ ntohl(th->seq); +#ifdef CONFIG_TLS_DEVICE + flush |= p->decrypted ^ skb->decrypted; +#endif if (flush || skb_gro_receive(p, skb)) { mss = 1; |