net: rkwifi: enable GET_CUSTOM_MAC_ENABLE

[firefly-linux-kernel-4.4.55.git] / fs / dlm / lowcomms.c

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 87e9d796cf7dd9ae2e4e0f221867dc69e8ea28df..9d7a4a71490738029fbc33e6d6a1ca1b00fe97f0 100644 (file)
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -421,7 +421,7 @@ static void lowcomms_write_space(struct sock *sk)
 
        if (test_and_clear_bit(CF_APP_LIMITED, &con->flags)) {
                con->sock->sk->sk_write_pending--;
-               clear_bit(SOCK_ASYNC_NOSPACE, &con->sock->flags);
+               clear_bit(SOCKWQ_ASYNC_NOSPACE, &con->sock->flags);
        }
 
        if (!test_and_set_bit(CF_WRITE_PENDING, &con->flags))
@@ -1448,7 +1448,7 @@ static void send_to_sock(struct connection *con)
                                              msg_flags);
                        if (ret == -EAGAIN || ret == 0) {
                                if (ret == -EAGAIN &&
-                                   test_bit(SOCK_ASYNC_NOSPACE, &con->sock->flags) &&
+                                   test_bit(SOCKWQ_ASYNC_NOSPACE, &con->sock->flags) &&
                                    !test_and_set_bit(CF_APP_LIMITED, &con->flags)) {
                                        /* Notify TCP that we're limited by the
                                         * application window size.
@@ -1607,16 +1607,12 @@ void dlm_lowcomms_stop(void)
        mutex_lock(&connections_lock);
        dlm_allow_conn = 0;
        foreach_conn(stop_conn);
+       clean_writequeues();
+       foreach_conn(free_conn);
        mutex_unlock(&connections_lock);
 
        work_stop();
 
-       mutex_lock(&connections_lock);
-       clean_writequeues();
-
-       foreach_conn(free_conn);
-
-       mutex_unlock(&connections_lock);
        kmem_cache_destroy(con_cache);
 }