diff options
| author |   David Howells <dhowells@redhat.com> | 2016-04-07 17:23:58 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-04-11 15:34:41 -0400 |
| commit | e0e4d82f3be60cfe8b10304c6daf3ca5973ae9e3 (patch) | |
| tree | 717c4bd8d4a001016917688b38ce767ecf79ce39 /net/rxrpc/ar-output.c | |
| parent | rxrpc: Absorb the rxkad security module (diff) | |
| download | linux-dev-e0e4d82f3be60cfe8b10304c6daf3ca5973ae9e3.tar.xz linux-dev-e0e4d82f3be60cfe8b10304c6daf3ca5973ae9e3.zip | |
rxrpc: Create a null security type and get rid of conditional calls
Create a null security type for security index 0 and get rid of all
conditional calls to the security operations. We expect normally to be
using security, so this should be of little negative impact.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rxrpc/ar-output.c')
| -rw-r--r-- | net/rxrpc/ar-output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c index 94e7d9537437..51cb10062a8d 100644 --- a/net/rxrpc/ar-output.c +++ b/net/rxrpc/ar-output.c @@ -663,7 +663,7 @@ static int rxrpc_send_data(struct rxrpc_sock *rx, size_t pad; /* pad out if we're using security */ - if (conn->security) { + if (conn->security_ix) { pad = conn->security_size + skb->mark; pad = conn->size_align - pad; pad &= conn->size_align - 1; @@ -695,7 +695,7 @@ static int rxrpc_send_data(struct rxrpc_sock *rx, if (more && seq & 1) sp->hdr.flags |= RXRPC_REQUEST_ACK; - ret = rxrpc_secure_packet( + ret = conn->security->secure_packet( call, skb, skb->mark, skb->head + sizeof(struct rxrpc_wire_header)); if (ret < 0) |