diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 14:35:07 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 14:35:07 -0400 |
| commit | 8109ed99dffe2ec974fc5ce87bd1da0ef4dd721c (patch) | |
| tree | f2d9806ccbb32418271600b6f5f83c737356deaa | |
| parent | f131727e421c3f2cfbf5d1843512d5e270b1ad04 (diff) | |
| download | longterm-queue-4.12-8109ed99dffe2ec974fc5ce87bd1da0ef4dd721c.tar.gz | |
net: drop patch for driver not in 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/net-hns3-Fix-a-misuse-to-devm_free_irq.patch | 35 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 36 deletions
diff --git a/queue/net-hns3-Fix-a-misuse-to-devm_free_irq.patch b/queue/net-hns3-Fix-a-misuse-to-devm_free_irq.patch deleted file mode 100644 index c5b39d4..0000000 --- a/queue/net-hns3-Fix-a-misuse-to-devm_free_irq.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ae064e6123f89f90af7e4ea190cc0c612643ca93 Mon Sep 17 00:00:00 2001 -From: qumingguang <qumingguang@huawei.com> -Date: Thu, 2 Nov 2017 20:45:22 +0800 -Subject: [PATCH] net: hns3: Fix a misuse to devm_free_irq - -commit ae064e6123f89f90af7e4ea190cc0c612643ca93 upstream. - -we should use free_irq to free the nic irq during the unloading time. -because we use request_irq to apply it when nic up. It will crash if -up net device after reset the port. This patch fixes the issue. - -Signed-off-by: qumingguang <qumingguang@huawei.com> -Signed-off-by: Lipeng <lipeng321@huawei.com> -Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com> -Signed-off-by: David S. Miller <davem@davemloft.net> - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c -index 39679fdb83c7..2a0af11c9b59 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c -@@ -2558,9 +2558,8 @@ static int hns3_nic_uninit_vector_data(struct hns3_nic_priv *priv) - (void)irq_set_affinity_hint( - priv->tqp_vector[i].vector_irq, - NULL); -- devm_free_irq(&pdev->dev, -- priv->tqp_vector[i].vector_irq, -- &priv->tqp_vector[i]); -+ free_irq(priv->tqp_vector[i].vector_irq, -+ &priv->tqp_vector[i]); - } - - priv->ring_data[i].ring->irq_init_flag = HNS3_VECTOR_NOT_INITED; --- -2.15.0 - diff --git a/queue/series b/queue/series index aea64cd..ff8144c 100644 --- a/queue/series +++ b/queue/series @@ -49,7 +49,6 @@ badblocks-fix-wrong-return-value-in-badblocks_set-if.patch iommu-amd-Limit-the-IOVA-page-range-to-the-specified.patch xfs-truncate-pagecache-before-writeback-in-xfs_setat.patch crypto-tcrypt-fix-buffer-lengths-in-test_aead_speed.patch -net-hns3-Fix-a-misuse-to-devm_free_irq.patch clk-mediatek-add-the-option-for-determining-PLL-sour.patch clk-imx-imx7d-Fix-parent-clock-for-OCRAM_CLK.patch clk-imx6-refine-hdmi_isfr-s-parent-to-make-HDMI-work.patch |