diff mbox

linux-generic: crypto: swap abort -> ODP_ABORT

Message ID 1420750246-19697-1-git-send-email-mike.holmes@linaro.org
State Accepted
Commit c87b01de7e650e50654316578a6c90d5b770a086
Headers show

Commit Message

Mike Holmes Jan. 8, 2015, 8:50 p.m. UTC
Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
---
 platform/linux-generic/odp_crypto.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Bill Fischofer Jan. 8, 2015, 8:53 p.m. UTC | #1
Note that Robbie is currently working on a crypto patch that may or may not
intersect with this.  May need to coordinate the sequencing.

On Thu, Jan 8, 2015 at 2:50 PM, Mike Holmes <mike.holmes@linaro.org> wrote:

> Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
>

Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>


> ---
>  platform/linux-generic/odp_crypto.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/platform/linux-generic/odp_crypto.c
> b/platform/linux-generic/odp_crypto.c
> index 13c5556..2f95cbe 100644
> --- a/platform/linux-generic/odp_crypto.c
> +++ b/platform/linux-generic/odp_crypto.c
> @@ -361,7 +361,7 @@ odp_crypto_operation(odp_crypto_op_params_t *params,
>                                 odp_buffer_alloc(session->output_pool);
>         if (params->pkt != params->out_pkt) {
>                 if (odp_unlikely(ODP_PACKET_INVALID == params->out_pkt))
> -                       abort();
> +                       ODP_ABORT();
>                 _odp_packet_copy_to_packet(params->pkt, 0,
> params->out_pkt, 0,
>                                            odp_packet_len(params->pkt));
>                 if (completion_event == odp_packet_to_buffer(params->pkt))
> @@ -440,7 +440,7 @@ odp_crypto_get_operation_compl_status(odp_buffer_t
> completion_event,
>         result = get_op_result_from_buffer(completion_event);
>
>         if (OP_RESULT_MAGIC != result->magic)
> -               abort();
> +               ODP_ABORT();
>
>         memcpy(auth, &result->auth, sizeof(*auth));
>         memcpy(cipher, &result->cipher, sizeof(*cipher));
> --
> 2.1.0
>
>
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/lng-odp
>
Mike Holmes Jan. 9, 2015, 2:58 p.m. UTC | #2
Applied

On 8 January 2015 at 15:53, Bill Fischofer <bill.fischofer@linaro.org>
wrote:

> Note that Robbie is currently working on a crypto patch that may or may
> not intersect with this.  May need to coordinate the sequencing.
>
> On Thu, Jan 8, 2015 at 2:50 PM, Mike Holmes <mike.holmes@linaro.org>
> wrote:
>
>> Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
>>
>
> Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
>
>
>> ---
>>  platform/linux-generic/odp_crypto.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/platform/linux-generic/odp_crypto.c
>> b/platform/linux-generic/odp_crypto.c
>> index 13c5556..2f95cbe 100644
>> --- a/platform/linux-generic/odp_crypto.c
>> +++ b/platform/linux-generic/odp_crypto.c
>> @@ -361,7 +361,7 @@ odp_crypto_operation(odp_crypto_op_params_t *params,
>>                                 odp_buffer_alloc(session->output_pool);
>>         if (params->pkt != params->out_pkt) {
>>                 if (odp_unlikely(ODP_PACKET_INVALID == params->out_pkt))
>> -                       abort();
>> +                       ODP_ABORT();
>>                 _odp_packet_copy_to_packet(params->pkt, 0,
>> params->out_pkt, 0,
>>                                            odp_packet_len(params->pkt));
>>                 if (completion_event == odp_packet_to_buffer(params->pkt))
>> @@ -440,7 +440,7 @@ odp_crypto_get_operation_compl_status(odp_buffer_t
>> completion_event,
>>         result = get_op_result_from_buffer(completion_event);
>>
>>         if (OP_RESULT_MAGIC != result->magic)
>> -               abort();
>> +               ODP_ABORT();
>>
>>         memcpy(auth, &result->auth, sizeof(*auth));
>>         memcpy(cipher, &result->cipher, sizeof(*cipher));
>> --
>> 2.1.0
>>
>>
>> _______________________________________________
>> lng-odp mailing list
>> lng-odp@lists.linaro.org
>> http://lists.linaro.org/mailman/listinfo/lng-odp
>>
>
>
diff mbox

Patch

diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 13c5556..2f95cbe 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -361,7 +361,7 @@  odp_crypto_operation(odp_crypto_op_params_t *params,
 				odp_buffer_alloc(session->output_pool);
 	if (params->pkt != params->out_pkt) {
 		if (odp_unlikely(ODP_PACKET_INVALID == params->out_pkt))
-			abort();
+			ODP_ABORT();
 		_odp_packet_copy_to_packet(params->pkt, 0, params->out_pkt, 0,
 					   odp_packet_len(params->pkt));
 		if (completion_event == odp_packet_to_buffer(params->pkt))
@@ -440,7 +440,7 @@  odp_crypto_get_operation_compl_status(odp_buffer_t completion_event,
 	result = get_op_result_from_buffer(completion_event);
 
 	if (OP_RESULT_MAGIC != result->magic)
-		abort();
+		ODP_ABORT();
 
 	memcpy(auth, &result->auth, sizeof(*auth));
 	memcpy(cipher, &result->cipher, sizeof(*cipher));