Fixes: 73f37a7e1993 ("hinic3: Queue pair resource initialization") Co-developed-by: Wu Di Signed-off-by: Wu Di Co-developed-by: Teng Peisen Signed-off-by: Teng Peisen Signed-off-by: Fan Gong --- .../huawei/hinic3/hinic3_netdev_ops.c | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_netdev_ops.c b/drivers/net/ethernet/huawei/hinic3/hinic3_netdev_ops.c index d1fd91d97ccf..1c6cb1149028 100644 --- a/drivers/net/ethernet/huawei/hinic3/hinic3_netdev_ops.c +++ b/drivers/net/ethernet/huawei/hinic3/hinic3_netdev_ops.c @@ -251,16 +251,17 @@ static void hinic3_remove_configure(struct net_device *netdev) hinic3_rss_uninit(netdev); } -static int hinic3_alloc_channel_resources(struct net_device *netdev, - struct hinic3_dyna_qp_params *qp_params, - struct hinic3_dyna_txrxq_params *trxq_params) +static int +hinic3_alloc_channel_resources(struct net_device *netdev, + struct hinic3_dyna_qp_params *qp_params, + struct hinic3_dyna_txrxq_params *q_params) { struct hinic3_nic_dev *nic_dev = netdev_priv(netdev); int err; - qp_params->num_qps = trxq_params->num_qps; - qp_params->sq_depth = trxq_params->sq_depth; - qp_params->rq_depth = trxq_params->rq_depth; + qp_params->num_qps = q_params->num_qps; + qp_params->sq_depth = q_params->sq_depth; + qp_params->rq_depth = q_params->rq_depth; err = hinic3_alloc_qps(nic_dev, qp_params); if (err) { @@ -268,7 +269,7 @@ static int hinic3_alloc_channel_resources(struct net_device *netdev, return err; } - err = hinic3_alloc_txrxq_resources(netdev, trxq_params); + err = hinic3_alloc_txrxq_resources(netdev, q_params); if (err) { netdev_err(netdev, "Failed to alloc txrxq resources\n"); hinic3_free_qps(nic_dev, qp_params); @@ -278,13 +279,14 @@ static int hinic3_alloc_channel_resources(struct net_device *netdev, return 0; } -static void hinic3_free_channel_resources(struct net_device *netdev, - struct hinic3_dyna_qp_params *qp_params, - struct hinic3_dyna_txrxq_params *trxq_params) +static void +hinic3_free_channel_resources(struct net_device *netdev, + struct hinic3_dyna_qp_params *qp_params, + struct hinic3_dyna_txrxq_params *q_params) { struct hinic3_nic_dev *nic_dev = netdev_priv(netdev); - hinic3_free_txrxq_resources(netdev, trxq_params); + hinic3_free_txrxq_resources(netdev, q_params); hinic3_free_qps(nic_dev, qp_params); } -- 2.43.0