drop net-ncsi-change-from-ndo_set_mac_address-to-dev_set_.patch from all queues for now

diff --git a/queue-5.10/net-ncsi-change-from-ndo_set_mac_address-to-dev_set_.patch b/queue-5.10/net-ncsi-change-from-ndo_set_mac_address-to-dev_set_.patch
deleted file mode 100644 (file)
index 33d0df4..0000000
--- a/queue-5.10/net-ncsi-change-from-ndo_set_mac_address-to-dev_set_.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From b1a4c95a08e679b7e62bdc1e163b02453de7a0f0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 7 Jun 2023 18:17:42 +0300
-Subject: net/ncsi: change from ndo_set_mac_address to dev_set_mac_address
-
-From: Ivan Mikhaylov <fr0st61te@gmail.com>
-
-[ Upstream commit 790071347a0a1a89e618eedcd51c687ea783aeb3 ]
-
-Change ndo_set_mac_address to dev_set_mac_address because
-dev_set_mac_address provides a way to notify network layer about MAC
-change. In other case, services may not aware about MAC change and keep
-using old one which set from network adapter driver.
-
-As example, DHCP client from systemd do not update MAC address without
-notification from net subsystem which leads to the problem with acquiring
-the right address from DHCP server.
-
-Fixes: cb10c7c0dfd9e ("net/ncsi: Add NCSI Broadcom OEM command")
-Cc: stable@vger.kernel.org # v6.0+ 2f38e84 net/ncsi: make one oem_gma function for all mfr id
-Signed-off-by: Paul Fertser <fercerpav@gmail.com>
-Signed-off-by: Ivan Mikhaylov <fr0st61te@gmail.com>
-Reviewed-by: Simon Horman <simon.horman@corigine.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/ncsi/ncsi-rsp.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c
-index 888ccc2d4e34b..47ffb790ff99f 100644
---- a/net/ncsi/ncsi-rsp.c
-+++ b/net/ncsi/ncsi-rsp.c
-@@ -616,7 +616,6 @@ static int ncsi_rsp_handler_oem_mlx_gma(struct ncsi_request *nr)
- {
-       struct ncsi_dev_priv *ndp = nr->ndp;
-       struct net_device *ndev = ndp->ndev.dev;
--      const struct net_device_ops *ops = ndev->netdev_ops;
-       struct ncsi_rsp_oem_pkt *rsp;
-       struct sockaddr saddr;
-       int ret = 0;
-@@ -630,7 +629,9 @@ static int ncsi_rsp_handler_oem_mlx_gma(struct ncsi_request *nr)
-       /* Set the flag for GMA command which should only be called once */
-       ndp->gma_flag = 1;
- 
--      ret = ops->ndo_set_mac_address(ndev, &saddr);
-+      rtnl_lock();
-+      ret = dev_set_mac_address(ndev, &saddr, NULL);
-+      rtnl_unlock();
-       if (ret < 0)
-               netdev_warn(ndev, "NCSI: 'Writing mac address to device failed\n");
- 
--- 
-2.40.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index a228e7002bfba572d029dbdba6e3c06eb86f2c44..6ec301fadcbe42b8411f42316064f3e5f159bd65 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -62,7 +62,6 @@ mmc-meson-gx-use-devm_mmc_alloc_host.patch
 mmc-meson-gx-fix-deferred-probing.patch
 tracing-probes-have-process_fetch_insn-take-a-void-i.patch
 tracing-probes-fix-to-update-dynamic-data-counter-if.patch
-net-ncsi-change-from-ndo_set_mac_address-to-dev_set_.patch
 virtio-mmio-use-to_virtio_mmio_device-to-simply-code.patch
 virtio-mmio-don-t-break-lifecycle-of-vm_dev.patch
 i2c-bcm-iproc-fix-bcm_iproc_i2c_isr-deadlock-issue.patch

diff --git a/queue-5.15/net-ncsi-change-from-ndo_set_mac_address-to-dev_set_.patch b/queue-5.15/net-ncsi-change-from-ndo_set_mac_address-to-dev_set_.patch
deleted file mode 100644 (file)
index db613e2..0000000
--- a/queue-5.15/net-ncsi-change-from-ndo_set_mac_address-to-dev_set_.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 391c70070422467c722f1ebafe2c9740c9c75143 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 7 Jun 2023 18:17:42 +0300
-Subject: net/ncsi: change from ndo_set_mac_address to dev_set_mac_address
-
-From: Ivan Mikhaylov <fr0st61te@gmail.com>
-
-[ Upstream commit 790071347a0a1a89e618eedcd51c687ea783aeb3 ]
-
-Change ndo_set_mac_address to dev_set_mac_address because
-dev_set_mac_address provides a way to notify network layer about MAC
-change. In other case, services may not aware about MAC change and keep
-using old one which set from network adapter driver.
-
-As example, DHCP client from systemd do not update MAC address without
-notification from net subsystem which leads to the problem with acquiring
-the right address from DHCP server.
-
-Fixes: cb10c7c0dfd9e ("net/ncsi: Add NCSI Broadcom OEM command")
-Cc: stable@vger.kernel.org # v6.0+ 2f38e84 net/ncsi: make one oem_gma function for all mfr id
-Signed-off-by: Paul Fertser <fercerpav@gmail.com>
-Signed-off-by: Ivan Mikhaylov <fr0st61te@gmail.com>
-Reviewed-by: Simon Horman <simon.horman@corigine.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/ncsi/ncsi-rsp.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c
-index 6447a09932f55..df548e781aab0 100644
---- a/net/ncsi/ncsi-rsp.c
-+++ b/net/ncsi/ncsi-rsp.c
-@@ -616,7 +616,6 @@ static int ncsi_rsp_handler_oem_mlx_gma(struct ncsi_request *nr)
- {
-       struct ncsi_dev_priv *ndp = nr->ndp;
-       struct net_device *ndev = ndp->ndev.dev;
--      const struct net_device_ops *ops = ndev->netdev_ops;
-       struct ncsi_rsp_oem_pkt *rsp;
-       struct sockaddr saddr;
-       int ret = 0;
-@@ -630,7 +629,9 @@ static int ncsi_rsp_handler_oem_mlx_gma(struct ncsi_request *nr)
-       /* Set the flag for GMA command which should only be called once */
-       ndp->gma_flag = 1;
- 
--      ret = ops->ndo_set_mac_address(ndev, &saddr);
-+      rtnl_lock();
-+      ret = dev_set_mac_address(ndev, &saddr, NULL);
-+      rtnl_unlock();
-       if (ret < 0)
-               netdev_warn(ndev, "NCSI: 'Writing mac address to device failed\n");
- 
--- 
-2.40.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 34ab870f04aa636d4a156b7d3fd976328bfa3215..4d982da2d7c20086779094e472a9545241e320c8 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -60,7 +60,6 @@ usb-dwc3-qcom-fix-null-deref-on-suspend.patch
 usb-dwc3-fix-use-after-free-on-core-driver-unbind.patch
 mmc-bcm2835-fix-deferred-probing.patch
 mmc-sunxi-fix-deferred-probing.patch
-net-ncsi-change-from-ndo_set_mac_address-to-dev_set_.patch
 arm-dts-imx6sll-fixup-of-operating-points.patch
 arm-dts-nxp-imx6sll-fix-wrong-property-name-in-usbph.patch
 btrfs-move-out-now-unused-bg-from-the-reclaim-list.patch

diff --git a/queue-5.4/net-ncsi-change-from-ndo_set_mac_address-to-dev_set_.patch b/queue-5.4/net-ncsi-change-from-ndo_set_mac_address-to-dev_set_.patch
deleted file mode 100644 (file)
index fdcffa0..0000000
--- a/queue-5.4/net-ncsi-change-from-ndo_set_mac_address-to-dev_set_.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 070674fb523fb3c395917b95765137adfaf9e175 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 7 Jun 2023 18:17:42 +0300
-Subject: net/ncsi: change from ndo_set_mac_address to dev_set_mac_address
-
-From: Ivan Mikhaylov <fr0st61te@gmail.com>
-
-[ Upstream commit 790071347a0a1a89e618eedcd51c687ea783aeb3 ]
-
-Change ndo_set_mac_address to dev_set_mac_address because
-dev_set_mac_address provides a way to notify network layer about MAC
-change. In other case, services may not aware about MAC change and keep
-using old one which set from network adapter driver.
-
-As example, DHCP client from systemd do not update MAC address without
-notification from net subsystem which leads to the problem with acquiring
-the right address from DHCP server.
-
-Fixes: cb10c7c0dfd9e ("net/ncsi: Add NCSI Broadcom OEM command")
-Cc: stable@vger.kernel.org # v6.0+ 2f38e84 net/ncsi: make one oem_gma function for all mfr id
-Signed-off-by: Paul Fertser <fercerpav@gmail.com>
-Signed-off-by: Ivan Mikhaylov <fr0st61te@gmail.com>
-Reviewed-by: Simon Horman <simon.horman@corigine.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/ncsi/ncsi-rsp.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c
-index e1c6bb4ab98fd..b3484af801597 100644
---- a/net/ncsi/ncsi-rsp.c
-+++ b/net/ncsi/ncsi-rsp.c
-@@ -616,7 +616,6 @@ static int ncsi_rsp_handler_oem_mlx_gma(struct ncsi_request *nr)
- {
-       struct ncsi_dev_priv *ndp = nr->ndp;
-       struct net_device *ndev = ndp->ndev.dev;
--      const struct net_device_ops *ops = ndev->netdev_ops;
-       struct ncsi_rsp_oem_pkt *rsp;
-       struct sockaddr saddr;
-       int ret = 0;
-@@ -630,7 +629,9 @@ static int ncsi_rsp_handler_oem_mlx_gma(struct ncsi_request *nr)
-       /* Set the flag for GMA command which should only be called once */
-       ndp->gma_flag = 1;
- 
--      ret = ops->ndo_set_mac_address(ndev, &saddr);
-+      rtnl_lock();
-+      ret = dev_set_mac_address(ndev, &saddr, NULL);
-+      rtnl_unlock();
-       if (ret < 0)
-               netdev_warn(ndev, "NCSI: 'Writing mac address to device failed\n");
- 
--- 
-2.40.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index d4b32383af05f5a3e75b58028f6fdacb7fa2eff2..203dff3fa78347c16d887e5fbf53d42a65eabf75 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -49,7 +49,6 @@ leds-trigger-netdev-recheck-netdev_led_mode_linkup-o.patch
 tracing-probes-have-process_fetch_insn-take-a-void-i.patch
 tracing-probes-fix-to-update-dynamic-data-counter-if.patch
 net-ncsi-fix-gma-flag-setting-after-response.patch
-net-ncsi-change-from-ndo_set_mac_address-to-dev_set_.patch
 nfsd4-kill-warnings-on-testing-stateids-with-mismatc.patch
 nfsd-remove-incorrect-check-in-nfsd4_validate_statei.patch
 virtio-mmio-convert-to-devm_platform_ioremap_resourc.patch