diff options
| author | David Howells <dhowells@redhat.com> | 2016-06-17 10:06:56 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-06-22 14:00:23 +0100 |
| commit | aa390bbe2113dd0de99cf35c39d7701d4412b744 (patch) | |
| tree | fd836f0bacb921ec94909a03ae801e5db855549b /net/rxrpc/input.c | |
| parent | 999b69f89241c9384c104b84329c13350fd696ef (diff) | |
| download | linux-aa390bbe2113dd0de99cf35c39d7701d4412b744.tar.bz2 | |
rxrpc: Kill off the rxrpc_transport struct
The rxrpc_transport struct is now redundant, given that the rxrpc_peer
struct is now per peer port rather than per peer host, so get rid of it.
Service connection lists are transferred to the rxrpc_peer struct, as is
the conn_lock. Previous patches moved the client connection handling out
of the rxrpc_transport struct and discarded the connection bundling code.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/input.c')
| -rw-r--r-- | net/rxrpc/input.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c index 799aec18aa7b..f4bd57b77b93 100644 --- a/net/rxrpc/input.c +++ b/net/rxrpc/input.c @@ -631,7 +631,6 @@ static struct rxrpc_connection *rxrpc_conn_from_local(struct rxrpc_local *local, struct sk_buff *skb) { struct rxrpc_peer *peer; - struct rxrpc_transport *trans; struct rxrpc_connection *conn; struct sockaddr_rxrpc srx; @@ -641,13 +640,8 @@ static struct rxrpc_connection *rxrpc_conn_from_local(struct rxrpc_local *local, if (!peer) goto cant_find_peer; - trans = rxrpc_find_transport(local, peer); + conn = rxrpc_find_connection(local, peer, skb); rcu_read_unlock(); - if (!trans) - goto cant_find_conn; - - conn = rxrpc_find_connection(trans, skb); - rxrpc_put_transport(trans); if (!conn) goto cant_find_conn; |