[1/1] net/bondig: fix type-mismatch in bonding

Message ID cb91b25ebb8bf85101c5acd8c24361e7f049fab0.1639136262.git.wangyunjian@huawei.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers
Series [1/1] net/bondig: fix type-mismatch in bonding |

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/github-robot: build success github build: passed
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS

Commit Message

Yunjian Wang Dec. 10, 2021, 11:41 a.m. UTC
There were some type-mismatch issues in bonding and fix them:
- Use %u to fix argument type mismatch in RTE_BOND_LOG.
- The internals->mode is of type uint8_t. But the function
  parameter 'mode' is of type int. So change the mode type
  from int to uint8_t.

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
 drivers/net/bonding/eth_bond_private.h | 2 +-
 drivers/net/bonding/rte_eth_bond_api.c | 2 +-
 drivers/net/bonding/rte_eth_bond_pmd.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
  

Comments

humin (Q) Dec. 11, 2021, 7:57 a.m. UTC | #1
Acked-by: Min Hu (Connor) <humin29@huawei.com>

在 2021/12/10 19:41, Yunjian Wang 写道:
> There were some type-mismatch issues in bonding and fix them:
> - Use %u to fix argument type mismatch in RTE_BOND_LOG.
> - The internals->mode is of type uint8_t. But the function
>    parameter 'mode' is of type int. So change the mode type
>    from int to uint8_t.
> 
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
>   drivers/net/bonding/eth_bond_private.h | 2 +-
>   drivers/net/bonding/rte_eth_bond_api.c | 2 +-
>   drivers/net/bonding/rte_eth_bond_pmd.c | 4 ++--
>   3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/bonding/eth_bond_private.h b/drivers/net/bonding/eth_bond_private.h
> index 8b104b6391..05117cc0d2 100644
> --- a/drivers/net/bonding/eth_bond_private.h
> +++ b/drivers/net/bonding/eth_bond_private.h
> @@ -240,7 +240,7 @@ slave_remove_mac_addresses(struct rte_eth_dev *bonded_eth_dev,
>   		uint16_t slave_port_id);
>   
>   int
> -bond_ethdev_mode_set(struct rte_eth_dev *eth_dev, int mode);
> +bond_ethdev_mode_set(struct rte_eth_dev *eth_dev, uint8_t mode);
>   
>   int
>   slave_configure(struct rte_eth_dev *bonded_eth_dev,
> diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c
> index 84943cffe2..e577be85a7 100644
> --- a/drivers/net/bonding/rte_eth_bond_api.c
> +++ b/drivers/net/bonding/rte_eth_bond_api.c
> @@ -668,7 +668,7 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id,
>   		}
>   
>   	if (slave_idx < 0) {
> -		RTE_BOND_LOG(ERR, "Couldn't find slave in port list, slave count %d",
> +		RTE_BOND_LOG(ERR, "Couldn't find slave in port list, slave count %u",
>   				internals->slave_count);
>   		return -1;
>   	}
> diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
> index 84f4900ee5..c48f41fc93 100644
> --- a/drivers/net/bonding/rte_eth_bond_pmd.c
> +++ b/drivers/net/bonding/rte_eth_bond_pmd.c
> @@ -1554,7 +1554,7 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
>   }
>   
>   int
> -bond_ethdev_mode_set(struct rte_eth_dev *eth_dev, int mode)
> +bond_ethdev_mode_set(struct rte_eth_dev *eth_dev, uint8_t mode)
>   {
>   	struct bond_dev_private *internals;
>   
> @@ -3293,7 +3293,7 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t mode)
>   	/* Set mode 4 default configuration */
>   	bond_mode_8023ad_setup(eth_dev, NULL);
>   	if (bond_ethdev_mode_set(eth_dev, mode)) {
> -		RTE_BOND_LOG(ERR, "Failed to set bonded device %d mode to %d",
> +		RTE_BOND_LOG(ERR, "Failed to set bonded device %u mode to %u",
>   				 eth_dev->data->port_id, mode);
>   		goto err;
>   	}
>
  
Ferruh Yigit Jan. 18, 2022, 11:30 a.m. UTC | #2
On 12/11/2021 7:57 AM, Min Hu (Connor) wrote:

> 在 2021/12/10 19:41, Yunjian Wang 写道:
>> There were some type-mismatch issues in bonding and fix them:
>> - Use %u to fix argument type mismatch in RTE_BOND_LOG.
>> - The internals->mode is of type uint8_t. But the function
>>    parameter 'mode' is of type int. So change the mode type
>>    from int to uint8_t.
>>
>> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> 
> Acked-by: Min Hu (Connor) <humin29@huawei.com>
> 


     Fixes: 2efb58cbab6e ("bond: new link bonding library")
     Fixes: a45b288ef21a ("bond: support link status polling")
     Fixes: 68451eb6698c ("net/bonding: call through EAL on create/free")
     Cc: stable@dpdk.org


Applied to dpdk-next-net/main, thanks.
  

Patch

diff --git a/drivers/net/bonding/eth_bond_private.h b/drivers/net/bonding/eth_bond_private.h
index 8b104b6391..05117cc0d2 100644
--- a/drivers/net/bonding/eth_bond_private.h
+++ b/drivers/net/bonding/eth_bond_private.h
@@ -240,7 +240,7 @@  slave_remove_mac_addresses(struct rte_eth_dev *bonded_eth_dev,
 		uint16_t slave_port_id);
 
 int
-bond_ethdev_mode_set(struct rte_eth_dev *eth_dev, int mode);
+bond_ethdev_mode_set(struct rte_eth_dev *eth_dev, uint8_t mode);
 
 int
 slave_configure(struct rte_eth_dev *bonded_eth_dev,
diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c
index 84943cffe2..e577be85a7 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -668,7 +668,7 @@  __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id,
 		}
 
 	if (slave_idx < 0) {
-		RTE_BOND_LOG(ERR, "Couldn't find slave in port list, slave count %d",
+		RTE_BOND_LOG(ERR, "Couldn't find slave in port list, slave count %u",
 				internals->slave_count);
 		return -1;
 	}
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 84f4900ee5..c48f41fc93 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1554,7 +1554,7 @@  mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
 }
 
 int
-bond_ethdev_mode_set(struct rte_eth_dev *eth_dev, int mode)
+bond_ethdev_mode_set(struct rte_eth_dev *eth_dev, uint8_t mode)
 {
 	struct bond_dev_private *internals;
 
@@ -3293,7 +3293,7 @@  bond_alloc(struct rte_vdev_device *dev, uint8_t mode)
 	/* Set mode 4 default configuration */
 	bond_mode_8023ad_setup(eth_dev, NULL);
 	if (bond_ethdev_mode_set(eth_dev, mode)) {
-		RTE_BOND_LOG(ERR, "Failed to set bonded device %d mode to %d",
+		RTE_BOND_LOG(ERR, "Failed to set bonded device %u mode to %u",
 				 eth_dev->data->port_id, mode);
 		goto err;
 	}