[PATCH] broadcom-wl-dkms 6.30.223.271-34: Add a patch for Linux 6.0

broadcom-wl-dkms-6.30.223.271-linux-6.0.patch

From 11c4fd124f16b2e5fe6014e5906753723934d0d1 Mon Sep 17 00:00:00 2001
From: Masato Toyoshima <phoepsilonix@gmail.com>
Date: Wed, 5 Oct 2022 18:59:42 +0900
Subject: [PATCH] broadcom-wl-dkms 6.30.223.271-34: Add a patch for Linux 6.0

---
 broadcom-wl-dkms/trunk/014-linux60.patch | 29 ++++++++++++++++++++++++
 broadcom-wl-dkms/trunk/PKGBUILD          |  6 +++--
 broadcom-wl-dkms/trunk/dkms.conf.in      |  1 +
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 broadcom-wl-dkms/trunk/014-linux60.patch

diff --git a/broadcom-wl-dkms/trunk/014-linux60.patch b/broadcom-wl-dkms/trunk/014-linux60.patch
new file mode 100644
index 000000000000..084be376f4d6
--- /dev/null
+++ b/broadcom-wl-dkms/trunk/014-linux60.patch
@@ -0,0 +1,29 @@
+From dbee29df729e543a89b3f95c1436e982eb0047c1 Mon Sep 17 00:00:00 2001
+From: Joan Bruguera <joanbrugueram@gmail.com>
+Date: Thu, 30 Jun 2022 02:15:35 +0200
+Subject: [PATCH] Tentative patch for broadcom-wl 6.30.223.271 driver for Linux 6.0-rc1
+
+Applies on top of all the patches applied to broadcom-wl-dkms 6.30.223.271-33 on Arch Linux.
+---
+ src/wl/sys/wl_cfg80211_hybrid.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+index d815b33..7faa735 100644
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -2381,7 +2381,12 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
+ 	bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
+ 	ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
+ 	struct cfg80211_roam_info roam_info = {
++// Rel. commit "cfg80211: Indicate MLO connection info in connect and roam callbacks" (Veerendranath Jakkam, Wed Jun 8)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
+ 		.bss = bss,
++#else
++		.links[0].bss = bss,
++#endif
+ 		.req_ie = conn_info->req_ie,
+ 		.req_ie_len = conn_info->req_ie_len,
+ 		.resp_ie = conn_info->resp_ie,
+-- 
+2.37.0
diff --git a/broadcom-wl-dkms/trunk/PKGBUILD b/broadcom-wl-dkms/trunk/PKGBUILD
index ec402494a1c5..2db62ce569ea 100644
--- a/broadcom-wl-dkms/trunk/PKGBUILD
+++ b/broadcom-wl-dkms/trunk/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=broadcom-wl-dkms
 pkgver=6.30.223.271
-pkgrel=33
+pkgrel=34
 pkgdesc='Broadcom 802.11 Linux STA wireless driver'
 arch=(x86_64)
 url='https://www.broadcom.com/site-search?filters[pages][content_type][type]=and&filters[pages][content_type][values][]=Downloads&page=1&per_page=10&q=802.11%20linux%20sta%20wireless%20driver'
@@ -29,9 +29,10 @@ source=(broadcom-wl-dkms.conf
         011-linux59.patch
         012-linux517.patch
         013-linux518.patch
+        014-linux60.patch
         "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz")
 b2sums=('7c4eaa825a37358509a08e5105665eeabc9f097945b6fa163cd5722b00638da5889f5466bd2c5f1b01172f2d0c9fb195f6e18329f2880adb2774406684cbc4c0'
-        '9c271945a30069d01cefa24c7dae84f359dd2f181699464b34ab884e279fdf5c2d2673a0b2ebdee50df92f76d22da68c77bfd22d003becfd1879b4fd2d10c412'
+        '4d03126756ea34bac5911a69882616ff279fc717e5056ae347fa36c301147aacb2ecf763a3d8aa56cf51ebdffe6241a3518f778f2a35b9ca85ff3c005351d00e'
         '038150b9a50025dbd3c81d09755956216b83c0b54db29dc4bfbc3b46bd67cf4640ad643d69ba7f8d486f52cedeb00929b97e02152e72404e6126a05855f97d6f'
         'bbc80e1ac01683ccc2d940212347fc11c74bdc252d492ca79a292015ac25df6a153ac97cb6c0f0a8d51c1c33d5dc0de4fdd61b1958499b946dc817d29646b72f'
         'ecf3eb75f8eb3331b0a36b39851536de43cffd3b303db9e9f4fe6fe55d463c3343aba17a99668448427764a719e15e3e862d6a3dc0bc61cb68da9934fb427c6f'
@@ -45,6 +46,7 @@ b2sums=('7c4eaa825a37358509a08e5105665eeabc9f097945b6fa163cd5722b00638da5889f546
         'c1f522f6554a7bfe0f7b789b042ada14316ecc87bc196c83bec95f684152f323a4c31f60ff26843e36338b8c7949bf36719a5c8afa439ff71f7c74dae4c755b6'
         'd84d08161530bb9f05f627ec798a0897643869ea9b80781ae9eee85b072922c52e5127e55f04265c53fcfedc4e9da166eb3bb9f9fc2e139d62517ec54c2f45bb'
         'e5ae3570dc2f27105c50e6dec807c1f4f1a2824995e0951e7ff405114d519e4f33992d8d2ea2c2d4fc3f9271d57f89bfb5b6b5c79af2c89492209a86ad673456'
+        'e98cc46889e651d236cfef18e15b46cf382495bbfae2545d0f046b353b48093ff1324ad8b23212f4413363669072fcce9ada0599d9779c1adbc2ee7575345575'
         'e9d01c1a1a63c07f720e3ee53ee3ef634ab12694135300cb0ce47ade0e9e0084967a0b6df64d983e8184240eb3defb128f650bddb7727e901d50315307f3398a')
 
 prepare() {
diff --git a/broadcom-wl-dkms/trunk/dkms.conf.in b/broadcom-wl-dkms/trunk/dkms.conf.in
index de5ab1ee9188..638dacecdacd 100644
--- a/broadcom-wl-dkms/trunk/dkms.conf.in
+++ b/broadcom-wl-dkms/trunk/dkms.conf.in
@@ -14,4 +14,5 @@ PATCH[8]="010-linux56.patch"
 PATCH[9]="011-linux59.patch"
 PATCH[10]="012-linux517.patch"
 PATCH[11]="013-linux518.patch"
+PATCH[12]="014-linux60.patch"
 AUTOINSTALL="yes"
-- 
2.37.3