Unverified Commit 37fbb7ba authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10958 bna: adjust 'name' buf size of bna_tcb and bna_ccb structures 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/E6LV6TZVAGYJ3ZNANHL2C4O7UNYQIEGC/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAKQ5H 
 
Link:https://gitee.com/openeuler/kernel/pulls/10958

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 678318ee c6d4ec9b

drivers/net/ethernet/brocade/bna/bna_types.h

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ struct bna_ib { 
/* Tx object */



/* Tx datapath control structure */

#define BNA_Q_NAME_SIZE		16

#define BNA_Q_NAME_SIZE		(IFNAMSIZ + 6)

struct bna_tcb {

	/* Fast path */

	void			**sw_qpt;

drivers/net/ethernet/brocade/bna/bnad.c

+6 −5
Original line number Diff line number Diff line
@@ -1535,7 +1535,8 @@ bnad_tx_msix_register(struct bnad *bnad, struct bnad_tx_info *tx_info, 


	for (i = 0; i < num_txqs; i++) {

		vector_num = tx_info->tcb[i]->intr_vector;

		sprintf(tx_info->tcb[i]->name, "%s TXQ %d", bnad->netdev->name,

		snprintf(tx_info->tcb[i]->name, BNA_Q_NAME_SIZE, "%s TXQ %d",

			 bnad->netdev->name,

			 tx_id + tx_info->tcb[i]->id);

		err = request_irq(bnad->msix_table[vector_num].vector,

				  (irq_handler_t)bnad_msix_tx, 0,
@@ -1586,8 +1587,8 @@ bnad_rx_msix_register(struct bnad *bnad, struct bnad_rx_info *rx_info, 


	for (i = 0; i < num_rxps; i++) {

		vector_num = rx_info->rx_ctrl[i].ccb->intr_vector;

		sprintf(rx_info->rx_ctrl[i].ccb->name, "%s CQ %d",

			bnad->netdev->name,

		snprintf(rx_info->rx_ctrl[i].ccb->name, BNA_Q_NAME_SIZE,

			 "%s CQ %d", bnad->netdev->name,

			 rx_id + rx_info->rx_ctrl[i].ccb->id);

		err = request_irq(bnad->msix_table[vector_num].vector,

				  (irq_handler_t)bnad_msix_rx, 0,