diff --git a/6.6/target/linux/bcm27xx/patches-6.6/0903-brcmfmac-Fix-802.1x.patch b/6.6/target/linux/bcm27xx/patches-6.6/0903-brcmfmac-Fix-802.1x.patch deleted file mode 100644 index cd1f8253..00000000 --- a/6.6/target/linux/bcm27xx/patches-6.6/0903-brcmfmac-Fix-802.1x.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 10bda80ab14365f31d857d01b7c20087bd8654c7 Mon Sep 17 00:00:00 2001 -From: Mike Cui -Date: Mon, 19 Feb 2024 17:11:49 -0800 -Subject: [PATCH 0903/1002] brcmfmac: Fix 802.1x - -Commit 7d239fbf9d4 broke 802.1X authentication by setting -profile->use_fwsup = NONE whenever PSK is not used. However -802.1X does not use PSK and requires profile->use_fwsup set -to 1X, or brcmf_cfg80211_set_pmk() fails. Fix this by checking -that profile->use_fwsup is not already set to 1X and avoid -setting it to NONE in that case. - -Fixes: 7d239fbf9d4 (brcmfmac: Fix interoperating DPP and other encryption network access) -Fixes: https://github.com/raspberrypi/linux/issues/5964 ---- - drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -index 5b13544fac7a..2c81b5d9fb09 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -@@ -2493,7 +2493,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev, - brcmf_dbg(INFO, "using PSK offload\n"); - profile->use_fwsup = BRCMF_PROFILE_FWSUP_PSK; - } -- } else { -+ } else if (profile->use_fwsup != BRCMF_PROFILE_FWSUP_1X) { - profile->use_fwsup = BRCMF_PROFILE_FWSUP_NONE; - } - --- -2.44.0 - diff --git a/6.6/target/linux/bcm27xx/patches-6.6/1001-Revert-usb-phy-generic-Get-the-vbus-supply.patch b/6.6/target/linux/bcm27xx/patches-6.6/1001-Revert-usb-phy-generic-Get-the-vbus-supply.patch deleted file mode 100644 index 5fd65332..00000000 --- a/6.6/target/linux/bcm27xx/patches-6.6/1001-Revert-usb-phy-generic-Get-the-vbus-supply.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8c3e7a55220cb7cb13131bb8dccd37694537eb97 Mon Sep 17 00:00:00 2001 -From: Dom Cobley -Date: Wed, 27 Mar 2024 19:03:08 +0000 -Subject: [PATCH 1001/1002] Revert "usb: phy: generic: Get the vbus supply" - -This reverts commit 03e607cbb2931374db1825f371e9c7f28526d3f4. ---- - drivers/usb/phy/phy-generic.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c -index 770081b828a4..c4b3f2484dc0 100644 ---- a/drivers/usb/phy/phy-generic.c -+++ b/drivers/usb/phy/phy-generic.c -@@ -261,13 +261,6 @@ int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_generic *nop) - return dev_err_probe(dev, PTR_ERR(nop->vcc), - "could not get vcc regulator\n"); - -- nop->vbus_draw = devm_regulator_get_exclusive(dev, "vbus"); -- if (PTR_ERR(nop->vbus_draw) == -ENODEV) -- nop->vbus_draw = NULL; -- if (IS_ERR(nop->vbus_draw)) -- return dev_err_probe(dev, PTR_ERR(nop->vbus_draw), -- "could not get vbus regulator\n"); -- - nop->dev = dev; - nop->phy.dev = nop->dev; - nop->phy.label = "nop-xceiv"; --- -2.44.0 -