diff mbox

[PATCHv2] linux-generic: fix logic for calling pktio init and term functions

Message ID 1438085791-19726-1-git-send-email-maxim.uvarov@linaro.org
State Accepted
Commit 89dc8af475d8cbdadb0efac6a1396d74a525dc30
Headers show

Commit Message

Maxim Uvarov July 28, 2015, 12:16 p.m. UTC
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
---
 v2: fix subject and typo.

 platform/linux-generic/odp_packet_io.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Stuart Haslam July 28, 2015, 12:52 p.m. UTC | #1
On Tue, Jul 28, 2015 at 03:16:31PM +0300, Maxim Uvarov wrote:
> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

Reviewed-by: Stuart Haslam <stuart.haslam@linaro.org>

> ---
>  v2: fix subject and typo.
> 
>  platform/linux-generic/odp_packet_io.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
> index 2bfec52..f3a4543 100644
> --- a/platform/linux-generic/odp_packet_io.c
> +++ b/platform/linux-generic/odp_packet_io.c
> @@ -74,7 +74,7 @@ int odp_pktio_init_global(void)
>  	}
>  
>  	for (pktio_if = 0; pktio_if_ops[pktio_if]; ++pktio_if) {
> -		if (!pktio_if_ops[pktio_if]->init)
> +		if (pktio_if_ops[pktio_if]->init)
>  			if (pktio_if_ops[pktio_if]->init())
>  				ODP_ERR("failed to initialized pktio type %d",
>  					pktio_if);
> @@ -91,9 +91,9 @@ int odp_pktio_term_global(void)
>  	int pktio_if;
>  
>  	for (pktio_if = 0; pktio_if_ops[pktio_if]; ++pktio_if) {
> -		if (!pktio_if_ops[pktio_if]->term)
> +		if (pktio_if_ops[pktio_if]->term)
>  			if (pktio_if_ops[pktio_if]->term())
> -				ODP_ERR("failed to terminaye pktio type %d",
> +				ODP_ERR("failed to terminate pktio type %d",
>  					pktio_if);
>  	}
>  
> -- 
> 1.9.1
> 
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/lng-odp
Maxim Uvarov July 28, 2015, 12:59 p.m. UTC | #2
Applied,

Maxim.

On 07/28/15 15:52, Stuart Haslam wrote:
> On Tue, Jul 28, 2015 at 03:16:31PM +0300, Maxim Uvarov wrote:
>> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
> Reviewed-by: Stuart Haslam <stuart.haslam@linaro.org>
>
>> ---
>>   v2: fix subject and typo.
>>
>>   platform/linux-generic/odp_packet_io.c | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
>> index 2bfec52..f3a4543 100644
>> --- a/platform/linux-generic/odp_packet_io.c
>> +++ b/platform/linux-generic/odp_packet_io.c
>> @@ -74,7 +74,7 @@ int odp_pktio_init_global(void)
>>   	}
>>   
>>   	for (pktio_if = 0; pktio_if_ops[pktio_if]; ++pktio_if) {
>> -		if (!pktio_if_ops[pktio_if]->init)
>> +		if (pktio_if_ops[pktio_if]->init)
>>   			if (pktio_if_ops[pktio_if]->init())
>>   				ODP_ERR("failed to initialized pktio type %d",
>>   					pktio_if);
>> @@ -91,9 +91,9 @@ int odp_pktio_term_global(void)
>>   	int pktio_if;
>>   
>>   	for (pktio_if = 0; pktio_if_ops[pktio_if]; ++pktio_if) {
>> -		if (!pktio_if_ops[pktio_if]->term)
>> +		if (pktio_if_ops[pktio_if]->term)
>>   			if (pktio_if_ops[pktio_if]->term())
>> -				ODP_ERR("failed to terminaye pktio type %d",
>> +				ODP_ERR("failed to terminate pktio type %d",
>>   					pktio_if);
>>   	}
>>   
>> -- 
>> 1.9.1
>>
>> _______________________________________________
>> lng-odp mailing list
>> lng-odp@lists.linaro.org
>> https://lists.linaro.org/mailman/listinfo/lng-odp
Maxim Uvarov July 28, 2015, 2:55 p.m. UTC | #3
On 07/28/15 17:25, Nicolas Morey Chaisemartin wrote:
> Sorry about this one!
> I have no idea how it managed to pass the tests...

Yes, I also passed that. It looked simple patch with noops :)

Maxim.

> ----- Original Message -----
>> From: "Maxim Uvarov" <maxim.uvarov@linaro.org>
>> To: lng-odp@lists.linaro.org
>> Sent: Tuesday, 28 July, 2015 2:16:31 PM
>> Subject: [lng-odp] [PATCHv2] linux-generic: fix logic for calling pktio init	and term functions
>>
>> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
>> ---
>>   v2: fix subject and typo.
>>
>>   platform/linux-generic/odp_packet_io.c | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/platform/linux-generic/odp_packet_io.c
>> b/platform/linux-generic/odp_packet_io.c
>> index 2bfec52..f3a4543 100644
>> --- a/platform/linux-generic/odp_packet_io.c
>> +++ b/platform/linux-generic/odp_packet_io.c
>> @@ -74,7 +74,7 @@ int odp_pktio_init_global(void)
>>   	}
>>   
>>   	for (pktio_if = 0; pktio_if_ops[pktio_if]; ++pktio_if) {
>> -		if (!pktio_if_ops[pktio_if]->init)
>> +		if (pktio_if_ops[pktio_if]->init)
>>   			if (pktio_if_ops[pktio_if]->init())
>>   				ODP_ERR("failed to initialized pktio type %d",
>>   					pktio_if);
>> @@ -91,9 +91,9 @@ int odp_pktio_term_global(void)
>>   	int pktio_if;
>>   
>>   	for (pktio_if = 0; pktio_if_ops[pktio_if]; ++pktio_if) {
>> -		if (!pktio_if_ops[pktio_if]->term)
>> +		if (pktio_if_ops[pktio_if]->term)
>>   			if (pktio_if_ops[pktio_if]->term())
>> -				ODP_ERR("failed to terminaye pktio type %d",
>> +				ODP_ERR("failed to terminate pktio type %d",
>>   					pktio_if);
>>   	}
>>   
>> --
>> 1.9.1
>>
>> _______________________________________________
>> lng-odp mailing list
>> lng-odp@lists.linaro.org
>> https://lists.linaro.org/mailman/listinfo/lng-odp
>>
Stuart Haslam July 28, 2015, 3:41 p.m. UTC | #4
On Tue, Jul 28, 2015 at 05:27:59PM +0200, Nicolas Morey Chaisemartin wrote:
> I'm off work so I can't run much tests but it seems like it should have segfaulted...
> Maybe it's worth checking why it did not crash and make sure these functions are called correctly ? (I'll be back in the office next week and give it a look)
> 
> Nicolas

It did segfault :)

https://ci.linaro.org/view/odp-ci/job/odp-api-check/ARCH=arm64,GIT_BRANCH=master,label=docker-utopic-arm64/364/console
diff mbox

Patch

diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
index 2bfec52..f3a4543 100644
--- a/platform/linux-generic/odp_packet_io.c
+++ b/platform/linux-generic/odp_packet_io.c
@@ -74,7 +74,7 @@  int odp_pktio_init_global(void)
 	}
 
 	for (pktio_if = 0; pktio_if_ops[pktio_if]; ++pktio_if) {
-		if (!pktio_if_ops[pktio_if]->init)
+		if (pktio_if_ops[pktio_if]->init)
 			if (pktio_if_ops[pktio_if]->init())
 				ODP_ERR("failed to initialized pktio type %d",
 					pktio_if);
@@ -91,9 +91,9 @@  int odp_pktio_term_global(void)
 	int pktio_if;
 
 	for (pktio_if = 0; pktio_if_ops[pktio_if]; ++pktio_if) {
-		if (!pktio_if_ops[pktio_if]->term)
+		if (pktio_if_ops[pktio_if]->term)
 			if (pktio_if_ops[pktio_if]->term())
-				ODP_ERR("failed to terminaye pktio type %d",
+				ODP_ERR("failed to terminate pktio type %d",
 					pktio_if);
 	}