drop wifi-mt76-mt7921-fix-null-pointer-access-in-mt7921_i.patch

diff --git a/queue-6.10/series b/queue-6.10/series
index 49b6c4317bc5e98162444286872c0865c139bc5a..dc10ef2e34512385b9ae1977d8f105a198c3673e 100644 (file)
--- a/queue-6.10/series
+++ b/queue-6.10/series
@@ -268,7 +268,6 @@ hid-cougar-fix-slab-out-of-bounds-read-in-cougar_rep.patch
 hid-amd_sfh-free-driver_data-after-destroying-hid-de.patch
 input-uinput-reject-requests-with-unreasonable-numbe.patch
 usbnet-ipheth-race-between-ipheth_close-and-error-ha.patch
-wifi-mt76-mt7921-fix-null-pointer-access-in-mt7921_i.patch
 squashfs-sanity-check-symbolic-link-size.patch
 of-irq-prevent-device-address-out-of-bounds-read-in-.patch
 lib-generic-radix-tree.c-fix-rare-race-in-__genradix.patch

diff --git a/queue-6.10/wifi-mt76-mt7921-fix-null-pointer-access-in-mt7921_i.patch b/queue-6.10/wifi-mt76-mt7921-fix-null-pointer-access-in-mt7921_i.patch
deleted file mode 100644 (file)
index 4097dc3..0000000
--- a/queue-6.10/wifi-mt76-mt7921-fix-null-pointer-access-in-mt7921_i.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c641fc7157397fce5f8a3e6468862f11cb36bcbb Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 12 Aug 2024 12:45:41 +0200
-Subject: wifi: mt76: mt7921: fix NULL pointer access in
- mt7921_ipv6_addr_change
-
-From: Bert Karwatzki <spasswolf@web.de>
-
-[ Upstream commit 479ffee68d59c599f8aed8fa2dcc8e13e7bd13c3 ]
-
-When disabling wifi mt7921_ipv6_addr_change() is called as a notifier.
-At this point mvif->phy is already NULL so we cannot use it here.
-
-Signed-off-by: Bert Karwatzki <spasswolf@web.de>
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-Signed-off-by: Kalle Valo <kvalo@kernel.org>
-Link: https://patch.msgid.link/20240812104542.80760-1-spasswolf@web.de
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/mediatek/mt76/mt7921/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
-index 3e3ad3518d85..cca7132ed6ab 100644
---- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
-+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
-@@ -1182,7 +1182,7 @@ static void mt7921_ipv6_addr_change(struct ieee80211_hw *hw,
-                                   struct inet6_dev *idev)
- {
-       struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
--      struct mt792x_dev *dev = mvif->phy->dev;
-+      struct mt792x_dev *dev = mt792x_hw_dev(hw);
-       struct inet6_ifaddr *ifa;
-       struct in6_addr ns_addrs[IEEE80211_BSS_ARP_ADDR_LIST_LEN];
-       struct sk_buff *skb;
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 0a6bb06df947f8fa3e616265f3b3871f134c5efe..238f37747401e6b7679a24ab625e200c4644288c 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -187,7 +187,6 @@ hid-cougar-fix-slab-out-of-bounds-read-in-cougar_rep.patch
 hid-amd_sfh-free-driver_data-after-destroying-hid-de.patch
 input-uinput-reject-requests-with-unreasonable-numbe.patch
 usbnet-ipheth-race-between-ipheth_close-and-error-ha.patch
-wifi-mt76-mt7921-fix-null-pointer-access-in-mt7921_i.patch
 squashfs-sanity-check-symbolic-link-size.patch
 of-irq-prevent-device-address-out-of-bounds-read-in-.patch
 lib-generic-radix-tree.c-fix-rare-race-in-__genradix.patch

diff --git a/queue-6.6/wifi-mt76-mt7921-fix-null-pointer-access-in-mt7921_i.patch b/queue-6.6/wifi-mt76-mt7921-fix-null-pointer-access-in-mt7921_i.patch
deleted file mode 100644 (file)
index 0da9be9..0000000
--- a/queue-6.6/wifi-mt76-mt7921-fix-null-pointer-access-in-mt7921_i.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 857d7854c40324bfc70a6d32c9eb0792bc7c0b56 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 12 Aug 2024 12:45:41 +0200
-Subject: wifi: mt76: mt7921: fix NULL pointer access in
- mt7921_ipv6_addr_change
-
-From: Bert Karwatzki <spasswolf@web.de>
-
-[ Upstream commit 479ffee68d59c599f8aed8fa2dcc8e13e7bd13c3 ]
-
-When disabling wifi mt7921_ipv6_addr_change() is called as a notifier.
-At this point mvif->phy is already NULL so we cannot use it here.
-
-Signed-off-by: Bert Karwatzki <spasswolf@web.de>
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-Signed-off-by: Kalle Valo <kvalo@kernel.org>
-Link: https://patch.msgid.link/20240812104542.80760-1-spasswolf@web.de
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/mediatek/mt76/mt7921/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
-index 6a5c2cae087d..6dec54431312 100644
---- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
-+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
-@@ -1095,7 +1095,7 @@ static void mt7921_ipv6_addr_change(struct ieee80211_hw *hw,
-                                   struct inet6_dev *idev)
- {
-       struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
--      struct mt792x_dev *dev = mvif->phy->dev;
-+      struct mt792x_dev *dev = mt792x_hw_dev(hw);
-       struct inet6_ifaddr *ifa;
-       struct in6_addr ns_addrs[IEEE80211_BSS_ARP_ADDR_LIST_LEN];
-       struct sk_buff *skb;
--- 
-2.43.0
-