diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 12:13:02 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 12:13:02 +0100 |
| commit | ef0bf620e9b81845368b9c72ffdbd6834e424526 (patch) | |
| tree | 7862e4ca1aa61a20f8e11502276b7f8633a39aa4 /net/rxrpc/ar-output.c | |
| parent | genirq: Free irq_desc with rcu (diff) | |
| parent | irqchip/mbigen: Implement the mbigen irq chip operation functions (diff) | |
| download | linux-ef0bf620e9b81845368b9c72ffdbd6834e424526.tar.xz linux-ef0bf620e9b81845368b9c72ffdbd6834e424526.zip | |
Merge branch 'irq/wire-msi-bridge' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull the MSI wire bridge implementation from Marc Zyngier along with
the first user of it. This is infrastructure to support a wired
interrupt to MSI interrupt brigde. The first user is mbigen found in
Hisilicon ARM SoCs.
Diffstat (limited to 'net/rxrpc/ar-output.c')
| -rw-r--r-- | net/rxrpc/ar-output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c index a40d3afe93b7..14c4e12c47b0 100644 --- a/net/rxrpc/ar-output.c +++ b/net/rxrpc/ar-output.c @@ -531,7 +531,7 @@ static int rxrpc_send_data(struct rxrpc_sock *rx, timeo = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT); /* this should be in poll */ - clear_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags); + sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk); if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN)) return -EPIPE; |