net: hns3: modify the IRQ name of TQP vector

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 <liuyonglong@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 01bad673443d2373de9b3d5e4baba8b225dc1aef..e240d99f7ca878d1769a74020fb59722290fb86c 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -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;