Unverified Commit 86df67d8 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5836 [OLK-6.6] Fix "'snprintf' output between 10 and 37 bytes into a... 

!5836 [OLK-6.6] Fix "'snprintf' output between 10 and 37 bytes into a destination of size 24" warning for RNP driver with loongarch-allmodconfig

Merge Pull Request from: @dong-yibo 
 
1 Fix Mucse Network adapter (RNP）driver warnings with loongarch-allmodconfig (loongarch64-linux-gcc (GCC) 13.2.0 with W=1)
update files:
drivers/net/ethernet/mucse/rnp/rnp_main.c
drivers/net/ethernet/mucse/rnp/rnp_mbx_fw.c 
 
Link:https://gitee.com/openeuler/kernel/pulls/5836

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parents 590f4f13 e6f7ae95

drivers/net/ethernet/mucse/rnp/rnp_main.c

+4 −3
Original line number Diff line number Diff line
@@ -2345,8 +2345,8 @@ static int rnp_request_msix_irqs(struct rnp_adapter *adapter) 


		if (q_vector->tx.ring && q_vector->rx.ring) {

			snprintf(q_vector->name,

				 sizeof(q_vector->name) - 1, "%s-%s-%d-%d",

				 netdev->name, "TxRx", i, q_vector->v_idx);

				 sizeof(q_vector->name), "%s-%s-%u",

				 netdev->name, "TxRx", i);

		} else {

			WARN(!(q_vector->tx.ring && q_vector->rx.ring),

			     "%s vector%d tx rx is null, v_idx:%d\n",
@@ -5731,7 +5731,8 @@ static int rnp_ioctl(struct net_device *netdev, struct ifreq *req, int cmd) 


#ifdef CONFIG_NET_POLL_CONTROLLER

/**

 * Polling 'interrupt' - used by things like netconsole to send skbs

 * rnp_netpoll - used by things like netconsole to send skbs

 * @netdev: netdev

 * without having to re-enable interrupts. It's not called while

 * the interrupt routine is executing.

 */

drivers/net/ethernet/mucse/rnp/rnp_mbx_fw.c

+5 −2
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ static int rnp_mbx_write_posted_locked(struct rnp_hw *hw, 
}



/**

 * force firmware report link event to driver

 * rnp_link_stat_mark_reset -force firmware report link event to driver

 * @hw: hw struct

 */

static void rnp_link_stat_mark_reset(struct rnp_hw *hw)

{
@@ -597,13 +598,15 @@ int rnp_mbx_reg_write(struct rnp_hw *hw, int fw_reg, int value) 
{

	struct mbx_fw_cmd_req req;

	int err;

	int temp[4];



	memset(&req, 0, sizeof(req));

	temp[0] = value;



	if (hw->fw_version < 0x00050200)

		return -EOPNOTSUPP;



	build_writereg_req(&req, NULL, fw_reg, 4, &value);

	build_writereg_req(&req, NULL, fw_reg, 4, temp);

	err = rnp_mbx_write_posted_locked(hw, &req);



	return err;