rxrpc: Permit multiple service binding

[mirror_ubuntu-artful-kernel.git] / net / rxrpc / call_accept.c

diff --git a/net/rxrpc/call_accept.c b/net/rxrpc/call_accept.c
index a8515b0d4717e7f53afdfc990eb0dcbe6387ae7d..544df53ccf790fe3bd9695d22629c372bf678551 100644 (file)
--- a/net/rxrpc/call_accept.c
+++ b/net/rxrpc/call_accept.c
@@ -341,7 +341,8 @@ struct rxrpc_call *rxrpc_new_incoming_call(struct rxrpc_local *local,
 
        /* Get the socket providing the service */
        rx = rcu_dereference(local->service);
-       if (rx && service_id == rx->srx.srx_service)
+       if (rx && (service_id == rx->srx.srx_service ||
+                  service_id == rx->second_service))
                goto found_service;
 
        trace_rxrpc_abort("INV", sp->hdr.cid, sp->hdr.callNumber, sp->hdr.seq,