From: Sasha Levin Date: Tue, 5 Nov 2024 10:20:28 +0000 (-0500) Subject: Drop net-hns3-fix-missing-features-due-to-dev-features-co.patch X-Git-Tag: v4.19.323~89 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e633e470947e3aa761e147fa7922aa3f20ea109;p=thirdparty%2Fkernel%2Fstable-queue.git Drop net-hns3-fix-missing-features-due-to-dev-features-co.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.15/net-hns3-fix-missing-features-due-to-dev-features-co.patch b/queue-5.15/net-hns3-fix-missing-features-due-to-dev-features-co.patch deleted file mode 100644 index 26c6e763126..00000000000 --- a/queue-5.15/net-hns3-fix-missing-features-due-to-dev-features-co.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7fb7b6de9d6d967efe5ce4b8c3ee1c58219ab0e6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:33 +0800 -Subject: net: hns3: fix missing features due to dev->features configuration - too early - -From: Hao Lan - -[ Upstream commit 662ecfc46690e92cf630f51b5d4bbbcffe102980 ] - -Currently, the netdev->features is configured in hns3_nic_set_features. -As a result, __netdev_update_features considers that there is no feature -difference, and the procedures of the real features are missing. - -Fixes: 2a7556bb2b73 ("net: hns3: implement ndo_features_check ops for hns3 driver") -Signed-off-by: Hao Lan -Signed-off-by: Jian Shen -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c -index d6bdcd9f285b0..f277ba8a15094 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c -@@ -2314,7 +2314,6 @@ static int hns3_nic_set_features(struct net_device *netdev, - return ret; - } - -- netdev->features = features; - return 0; - } - --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index ceb06b5605d..e53b27ff1be 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -25,7 +25,6 @@ bpf-fix-out-of-bounds-write-in-trie_get_next_key.patch netfilter-fix-use-after-free-in-get_info.patch net-skip-offload-for-netif_f_ipv6_csum-if-ipv6-heade.patch netfilter-nft_payload-sanitize-offset-and-length-bef.patch -net-hns3-fix-missing-features-due-to-dev-features-co.patch net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch firmware-arm_sdei-fix-the-input-parameter-of-cpuhp_r.patch diff --git a/queue-6.1/net-hns3-fix-missing-features-due-to-dev-features-co.patch b/queue-6.1/net-hns3-fix-missing-features-due-to-dev-features-co.patch deleted file mode 100644 index 6bdbff6380d..00000000000 --- a/queue-6.1/net-hns3-fix-missing-features-due-to-dev-features-co.patch +++ /dev/null @@ -1,39 +0,0 @@ -From fb4210f968cc5dfece88e7ec7449d81a6e623684 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:33 +0800 -Subject: net: hns3: fix missing features due to dev->features configuration - too early - -From: Hao Lan - -[ Upstream commit 662ecfc46690e92cf630f51b5d4bbbcffe102980 ] - -Currently, the netdev->features is configured in hns3_nic_set_features. -As a result, __netdev_update_features considers that there is no feature -difference, and the procedures of the real features are missing. - -Fixes: 2a7556bb2b73 ("net: hns3: implement ndo_features_check ops for hns3 driver") -Signed-off-by: Hao Lan -Signed-off-by: Jian Shen -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c -index 0377a056aaecc..52e205be4ec2e 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c -@@ -2455,7 +2455,6 @@ static int hns3_nic_set_features(struct net_device *netdev, - return ret; - } - -- netdev->features = features; - return 0; - } - --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 39f05adcbea..8799f807d4c 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -35,7 +35,6 @@ mlxsw-spectrum_router-add-support-for-double-entry-r.patch mlxsw-spectrum_ipip-rename-spectrum-2-ip6gre-operati.patch mlxsw-spectrum_ipip-fix-memory-leak-when-changing-re.patch netfilter-nft_payload-sanitize-offset-and-length-bef.patch -net-hns3-fix-missing-features-due-to-dev-features-co.patch net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch iomap-convert-iomap_unshare_iter-to-use-large-folios.patch diff --git a/queue-6.11/net-hns3-fix-missing-features-due-to-dev-features-co.patch b/queue-6.11/net-hns3-fix-missing-features-due-to-dev-features-co.patch deleted file mode 100644 index 77375fe82e4..00000000000 --- a/queue-6.11/net-hns3-fix-missing-features-due-to-dev-features-co.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 13a78ddb18ae91d5a4ed9b425510d9427574ddf7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:33 +0800 -Subject: net: hns3: fix missing features due to dev->features configuration - too early - -From: Hao Lan - -[ Upstream commit 662ecfc46690e92cf630f51b5d4bbbcffe102980 ] - -Currently, the netdev->features is configured in hns3_nic_set_features. -As a result, __netdev_update_features considers that there is no feature -difference, and the procedures of the real features are missing. - -Fixes: 2a7556bb2b73 ("net: hns3: implement ndo_features_check ops for hns3 driver") -Signed-off-by: Hao Lan -Signed-off-by: Jian Shen -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c -index 8760b4e9ade6b..b09f0cca34dc6 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c -@@ -2483,7 +2483,6 @@ static int hns3_nic_set_features(struct net_device *netdev, - return ret; - } - -- netdev->features = features; - return 0; - } - --- -2.43.0 - diff --git a/queue-6.11/series b/queue-6.11/series index 09ebf197f21..1eebafc8d7c 100644 --- a/queue-6.11/series +++ b/queue-6.11/series @@ -53,7 +53,6 @@ mlxsw-pci-sync-rx-buffers-for-device.patch mlxsw-spectrum_ipip-fix-memory-leak-when-changing-re.patch net-ethernet-mtk_wed-fix-path-of-mt7988-wo-firmware.patch netfilter-nft_payload-sanitize-offset-and-length-bef.patch -net-hns3-fix-missing-features-due-to-dev-features-co.patch net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch bpf-test_run-fix-live_frame-frame-update-after-a-pag.patch diff --git a/queue-6.6/net-hns3-fix-missing-features-due-to-dev-features-co.patch b/queue-6.6/net-hns3-fix-missing-features-due-to-dev-features-co.patch deleted file mode 100644 index cad81e8243f..00000000000 --- a/queue-6.6/net-hns3-fix-missing-features-due-to-dev-features-co.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 28b4fe01562fe516b358275e722e8c353c876623 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:33 +0800 -Subject: net: hns3: fix missing features due to dev->features configuration - too early - -From: Hao Lan - -[ Upstream commit 662ecfc46690e92cf630f51b5d4bbbcffe102980 ] - -Currently, the netdev->features is configured in hns3_nic_set_features. -As a result, __netdev_update_features considers that there is no feature -difference, and the procedures of the real features are missing. - -Fixes: 2a7556bb2b73 ("net: hns3: implement ndo_features_check ops for hns3 driver") -Signed-off-by: Hao Lan -Signed-off-by: Jian Shen -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c -index bfcebf4e235ef..123d8e7411998 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c -@@ -2487,7 +2487,6 @@ static int hns3_nic_set_features(struct net_device *netdev, - return ret; - } - -- netdev->features = features; - return 0; - } - --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index cc32d5a188b..0de121e2a76 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -37,7 +37,6 @@ net-skip-offload-for-netif_f_ipv6_csum-if-ipv6-heade.patch mlxsw-spectrum_ptp-add-missing-verification-before-p.patch mlxsw-spectrum_ipip-fix-memory-leak-when-changing-re.patch netfilter-nft_payload-sanitize-offset-and-length-bef.patch -net-hns3-fix-missing-features-due-to-dev-features-co.patch net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch bpf-test_run-fix-live_frame-frame-update-after-a-pag.patch