diff options
author | David Howells <dhowells@redhat.com> | 2016-04-07 18:23:58 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-04-11 21:34:41 +0200 |
commit | e0e4d82f3be60cfe8b10304c6daf3ca5973ae9e3 (patch) | |
tree | 717c4bd8d4a001016917688b38ce767ecf79ce39 /net/rxrpc/ar-ack.c | |
parent | rxrpc: Absorb the rxkad security module (diff) | |
download | linux-e0e4d82f3be60cfe8b10304c6daf3ca5973ae9e3.tar.xz linux-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-ack.c')
-rw-r--r-- | net/rxrpc/ar-ack.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c index 3cd9264806a4..374478e006e7 100644 --- a/net/rxrpc/ar-ack.c +++ b/net/rxrpc/ar-ack.c @@ -588,7 +588,8 @@ process_further: _proto("OOSQ DATA %%%u { #%u }", sp->hdr.serial, sp->hdr.seq); /* secured packets must be verified and possibly decrypted */ - if (rxrpc_verify_packet(call, skb, _abort_code) < 0) + if (call->conn->security->verify_packet(call, skb, + _abort_code) < 0) goto protocol_error; rxrpc_insert_oos_packet(call, skb); |