diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /net/rxrpc/call_accept.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'net/rxrpc/call_accept.c')
| -rw-r--r-- | net/rxrpc/call_accept.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/rxrpc/call_accept.c b/net/rxrpc/call_accept.c index 0b2832141bd0..9bae21e66d65 100644 --- a/net/rxrpc/call_accept.c +++ b/net/rxrpc/call_accept.c | |||
| @@ -130,6 +130,7 @@ static int rxrpc_accept_incoming_call(struct rxrpc_local *local, | |||
| 130 | call->state = RXRPC_CALL_SERVER_ACCEPTING; | 130 | call->state = RXRPC_CALL_SERVER_ACCEPTING; |
| 131 | list_add_tail(&call->accept_link, &rx->acceptq); | 131 | list_add_tail(&call->accept_link, &rx->acceptq); |
| 132 | rxrpc_get_call(call); | 132 | rxrpc_get_call(call); |
| 133 | atomic_inc(&call->skb_count); | ||
| 133 | nsp = rxrpc_skb(notification); | 134 | nsp = rxrpc_skb(notification); |
| 134 | nsp->call = call; | 135 | nsp->call = call; |
| 135 | 136 | ||