Skip to content

Commit

Permalink
net: hns3: modify the IRQ name of TQP vector
Browse files Browse the repository at this point in the history
When rename the net devices, the IRQ number can not be
fetched by the net device name, because the driver request
the IRQ resources only when the vector resource changed, and
the rename operation did not change the vector resources,
so the IRQ name keeps the previous net device name.
So this patch modifies the name of the TQP IRQ as
"pci driver name"-"pci name"-"TxRx"-"index".

Signed-off-by: Yonglong Liu <[email protected]>
Signed-off-by: Huazhong Tan <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
liuyonglong86 authored and davem330 committed Jan 6, 2020
1 parent 08a1006 commit 5bffde6
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,18 +133,21 @@ static int hns3_nic_init_irq(struct hns3_nic_priv *priv)
continue;

if (tqp_vectors->tx_group.ring && tqp_vectors->rx_group.ring) {
snprintf(tqp_vectors->name, HNAE3_INT_NAME_LEN - 1,
"%s-%s-%d", priv->netdev->name, "TxRx",
txrx_int_idx++);
snprintf(tqp_vectors->name, HNAE3_INT_NAME_LEN,
"%s-%s-%s-%d", hns3_driver_name,
pci_name(priv->ae_handle->pdev),
"TxRx", txrx_int_idx++);
txrx_int_idx++;
} else if (tqp_vectors->rx_group.ring) {
snprintf(tqp_vectors->name, HNAE3_INT_NAME_LEN - 1,
"%s-%s-%d", priv->netdev->name, "Rx",
rx_int_idx++);
snprintf(tqp_vectors->name, HNAE3_INT_NAME_LEN,
"%s-%s-%s-%d", hns3_driver_name,
pci_name(priv->ae_handle->pdev),
"Rx", rx_int_idx++);
} else if (tqp_vectors->tx_group.ring) {
snprintf(tqp_vectors->name, HNAE3_INT_NAME_LEN - 1,
"%s-%s-%d", priv->netdev->name, "Tx",
tx_int_idx++);
snprintf(tqp_vectors->name, HNAE3_INT_NAME_LEN,
"%s-%s-%s-%d", hns3_driver_name,
pci_name(priv->ae_handle->pdev),
"Tx", tx_int_idx++);
} else {
/* Skip this unused q_vector */
continue;
Expand Down

0 comments on commit 5bffde6

Please sign in to comment.