mac80211: update to linux 6.1-rc8

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / brcm / 860-brcmfmac-register-wiphy-s-during-module_init.patch

diff --git a/package/kernel/mac80211/patches/brcm/860-brcmfmac-register-wiphy-s-during-module_init.patch b/package/kernel/mac80211/patches/brcm/860-brcmfmac-register-wiphy-s-during-module_init.patch
index 7b9512f74100b17090e364f7899bd1ef18b775cc..9d0f3e20b1de0f04601c314c5cf20e0794738fac 100644 (file)
--- a/package/kernel/mac80211/patches/brcm/860-brcmfmac-register-wiphy-s-during-module_init.patch
+++ b/package/kernel/mac80211/patches/brcm/860-brcmfmac-register-wiphy-s-during-module_init.patch
@@ -13,15 +13,15 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c

-@@ -431,6 +431,7 @@ struct brcmf_fw {
-       struct brcmf_fw_request *req;
+@@ -459,6 +459,7 @@ struct brcmf_fw {

        u32 curpos;
        u32 curpos;

+       unsigned int board_index;

        void (*done)(struct device *dev, int err, struct brcmf_fw_request *req);
 +      struct completion *completion;
  };
  
  #ifdef CONFIG_EFI
        void (*done)(struct device *dev, int err, struct brcmf_fw_request *req);
 +      struct completion *completion;
  };
  
  #ifdef CONFIG_EFI

-@@ -655,6 +656,8 @@ static void brcmf_fw_request_done(const
+@@ -686,6 +687,8 @@ static void brcmf_fw_request_done(const

                fwctx->req = NULL;
        }
        fwctx->done(fwctx->dev, ret, fwctx->req);
                fwctx->req = NULL;
        }
        fwctx->done(fwctx->dev, ret, fwctx->req);


@@ -30,7 +30,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
        kfree(fwctx);
  }
  
        kfree(fwctx);
  }
  

-@@ -695,6 +698,8 @@ int brcmf_fw_get_firmwares(struct device
+@@ -751,6 +754,8 @@ int brcmf_fw_get_firmwares(struct device

  {
        struct brcmf_fw_item *first = &req->items[0];
        struct brcmf_fw *fwctx;
  {
        struct brcmf_fw_item *first = &req->items[0];
        struct brcmf_fw *fwctx;


@@ -39,7 +39,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
        char *alt_path = NULL;
        int ret;
  
        char *alt_path = NULL;
        int ret;
  

-@@ -712,6 +717,9 @@ int brcmf_fw_get_firmwares(struct device
+@@ -768,6 +773,9 @@ int brcmf_fw_get_firmwares(struct device

        fwctx->dev = dev;
        fwctx->req = req;
        fwctx->done = fw_cb;
        fwctx->dev = dev;
        fwctx->req = req;
        fwctx->done = fw_cb;


@@ -48,8 +48,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +      fwctx->completion = &completion;
  
        /* First try alternative board-specific path if any */
 +      fwctx->completion = &completion;
  
        /* First try alternative board-specific path if any */

-       if (fwctx->req->board_type)
-@@ -730,6 +738,12 @@ int brcmf_fw_get_firmwares(struct device
+       if (fwctx->req->board_types[0])
+@@ -787,6 +795,12 @@ int brcmf_fw_get_firmwares(struct device

        if (ret < 0)
                brcmf_fw_request_done(NULL, fwctx);
  
        if (ret < 0)
                brcmf_fw_request_done(NULL, fwctx);