From 0d0c1021f3049d9b695b25a67a892bbe065757b5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 22 Jul 2023 13:51:17 +0200 Subject: [PATCH] drop networking patch --- ...t_mac_address-to-dev_set_mac_address.patch | 50 ------------------- queue-6.1/series | 1 - ...t_mac_address-to-dev_set_mac_address.patch | 50 ------------------- queue-6.4/series | 1 - 4 files changed, 102 deletions(-) delete mode 100644 queue-6.1/net-ncsi-change-from-ndo_set_mac_address-to-dev_set_mac_address.patch delete mode 100644 queue-6.4/net-ncsi-change-from-ndo_set_mac_address-to-dev_set_mac_address.patch diff --git a/queue-6.1/net-ncsi-change-from-ndo_set_mac_address-to-dev_set_mac_address.patch b/queue-6.1/net-ncsi-change-from-ndo_set_mac_address-to-dev_set_mac_address.patch deleted file mode 100644 index 1ffb57b8b18..00000000000 --- a/queue-6.1/net-ncsi-change-from-ndo_set_mac_address-to-dev_set_mac_address.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 790071347a0a1a89e618eedcd51c687ea783aeb3 Mon Sep 17 00:00:00 2001 -From: Ivan Mikhaylov -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 - -commit 790071347a0a1a89e618eedcd51c687ea783aeb3 upstream. - -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 -Signed-off-by: Ivan Mikhaylov -Reviewed-by: Simon Horman -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - net/ncsi/ncsi-rsp.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - ---- 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_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( - /* 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"); - diff --git a/queue-6.1/series b/queue-6.1/series index 5887242dd5e..108c1ec957a 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -1,4 +1,3 @@ -net-ncsi-change-from-ndo_set_mac_address-to-dev_set_mac_address.patch hid-amd_sfh-rename-the-float32-variable.patch hid-amd_sfh-fix-for-shift-out-of-bounds.patch net-lan743x-don-t-sleep-in-atomic-context.patch diff --git a/queue-6.4/net-ncsi-change-from-ndo_set_mac_address-to-dev_set_mac_address.patch b/queue-6.4/net-ncsi-change-from-ndo_set_mac_address-to-dev_set_mac_address.patch deleted file mode 100644 index 1ffb57b8b18..00000000000 --- a/queue-6.4/net-ncsi-change-from-ndo_set_mac_address-to-dev_set_mac_address.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 790071347a0a1a89e618eedcd51c687ea783aeb3 Mon Sep 17 00:00:00 2001 -From: Ivan Mikhaylov -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 - -commit 790071347a0a1a89e618eedcd51c687ea783aeb3 upstream. - -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 -Signed-off-by: Ivan Mikhaylov -Reviewed-by: Simon Horman -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - net/ncsi/ncsi-rsp.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - ---- 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_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( - /* 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"); - diff --git a/queue-6.4/series b/queue-6.4/series index 1eb37b42502..1d497434a16 100644 --- a/queue-6.4/series +++ b/queue-6.4/series @@ -1,4 +1,3 @@ -net-ncsi-change-from-ndo_set_mac_address-to-dev_set_mac_address.patch security-integrity-fix-pointer-to-esl-data-and-its-size-on-pseries.patch hid-input-fix-mapping-for-camera-access-keys.patch hid-amd_sfh-rename-the-float32-variable.patch -- 2.47.3