Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

The bpf syscall and selftests conflicts were trivial
overlapping changes.

The r8169 change involved moving the added mdelay from 'net' into a
different function.

A TLS close bug fix overlapped with the splitting of the TLS state
into separate TX and RX parts.  I just expanded the tests in the bug
fix from "ctx->conf == X" into "ctx->tx_conf == X && ctx->rx_conf
== X".

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

1 files changed, 6 insertions, 8 deletions

diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index 4b57ddd72f34..301f22430469 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -135,6 +135,7 @@ retry:
                         offset -= sg->offset;
                         ctx->partially_sent_offset = offset;
                         ctx->partially_sent_record = (void *)sg;
+                        ctx->in_tcp_sendpages = false;
                         return ret;
                 }
 
@@ -248,16 +249,14 @@ static void tls_sk_proto_close(struct sock *sk, long timeout)
         struct tls_context *ctx = tls_get_ctx(sk);
         long timeo = sock_sndtimeo(sk, 0);
         void (*sk_proto_close)(struct sock *sk, long timeout);
+        bool free_ctx = false;
 
         lock_sock(sk);
         sk_proto_close = ctx->sk_proto_close;
 
-        if (ctx->tx_conf == TLS_HW_RECORD && ctx->rx_conf == TLS_HW_RECORD)
-                goto skip_tx_cleanup;
-
-        if (ctx->tx_conf == TLS_BASE && ctx->rx_conf == TLS_BASE) {
-                kfree(ctx);
-                ctx = NULL;
+        if ((ctx->tx_conf == TLS_HW_RECORD && ctx->rx_conf == TLS_HW_RECORD) ||
+            (ctx->tx_conf == TLS_BASE && ctx->rx_conf == TLS_BASE)) {
+                free_ctx = true;
                 goto skip_tx_cleanup;
         }
 
@@ -305,8 +304,7 @@ skip_tx_cleanup:
         /* free ctx for TLS_HW_RECORD, used by tcp_set_state
          * for sk->sk_prot->unhash [tls_hw_unhash]
          */
-        if (ctx && ctx->tx_conf == TLS_HW_RECORD &&
-            ctx->rx_conf == TLS_HW_RECORD)
+        if (free_ctx)
                 kfree(ctx);
 }