Arch Linux

Silver Saucepan

Member

From: Bedfordshire, UK

Registered: 2023-08-01

Posts: 11

6.13.arch1-1: Wifi not working on macbookPro 2012

My 2012 macbookPro uses the Broadcom BCM4331 Wifi chip.  It works fine with linux-6.12.10.arch1-1 but because I have core-testing enabled I received an upgrade to 6.13.arch1-1 and the wifi stopped working.  Not sure how to diagnose this but downgrading back to 6.12.10 restored the wifi (sudo pacman -U /var/cache/pacman/pkg/linux-6.12.10.arch1-1-x86_64.pkg.tar.zst)

loqs

Member

Registered: 2014-03-06

Posts: 18,868

Re: 6.13.arch1-1: Wifi not working on macbookPro 2012

broadcom-dkms needs updating for 6.13.0-arch1-1:

DKMS make.log for broadcom-wl/6.30.223.271 for kernel 6.13.0-arch1-1 (x86_64)
Thu Jan 23 18:49:49 UTC 2025
make: Entering directory '/usr/lib/modules/6.13.0-arch1-1/build'
make[1]: Entering directory '/var/lib/dkms/broadcom-wl/6.30.223.271/build'
CFG80211 API is prefered for this kernel version
Using CFG80211 API
  CC [M]  src/shared/linux_osl.o
  CC [M]  src/wl/sys/wl_linux.o
  CC [M]  src/wl/sys/wl_iw.o
  CC [M]  src/wl/sys/wl_cfg80211_hybrid.o
In file included from src/shared/linux_osl.c:25:
././src/include/linuxver.h:151:10: fatal error: net/lib80211.h: No such file or directory
  151 | #include <net/lib80211.h>
      |          ^~~~~~~~~~~~~~~~
compilation terminated.
make[3]: *** [/usr/lib/modules/6.13.0-arch1-1/build/scripts/Makefile.build:194: src/shared/linux_osl.o] Error 1
make[3]: *** Waiting for unfinished jobs....
In file included from src/wl/sys/wl_linux.c:27:
././src/include/linuxver.h:151:10: fatal error: net/lib80211.h: No such file or directory
  151 | #include <net/lib80211.h>
      |          ^~~~~~~~~~~~~~~~
compilation terminated.
In file included from src/wl/sys/wl_cfg80211_hybrid.c:26:
././src/include/linuxver.h:151:10: fatal error: net/lib80211.h: No such file or directory
  151 | #include <net/lib80211.h>
      |          ^~~~~~~~~~~~~~~~
compilation terminated.
make[3]: *** [/usr/lib/modules/6.13.0-arch1-1/build/scripts/Makefile.build:194: src/wl/sys/wl_linux.o] Error 1
make[3]: *** [/usr/lib/modules/6.13.0-arch1-1/build/scripts/Makefile.build:194: src/wl/sys/wl_cfg80211_hybrid.o] Error 1
make[2]: *** [/usr/lib/modules/6.13.0-arch1-1/build/Makefile:1989: .] Error 2
make[1]: *** [/usr/lib/modules/6.13.0-arch1-1/build/Makefile:251: __sub-make] Error 2
make[1]: Leaving directory '/var/lib/dkms/broadcom-wl/6.30.223.271/build'
make: *** [Makefile:251: __sub-make] Error 2
make: Leaving directory '/usr/lib/modules/6.13.0-arch1-1/build'

Edit:
Related kernel commit https://git.kernel.org/pub/scm/linux/ke … ed8aeecb4f
Edit2:
This is the long version of the patch that removes all the unneeded includes as C pointers always have the same size and the pointer is never de-referenced (or even used) so its type does not matter.

diff --git a/src/include/linuxver.h b/src/include/linuxver.h
index b05bc32..6d62077 100644
--- a/src/include/linuxver.h
+++ b/src/include/linuxver.h
@@ -147,17 +147,6 @@ typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs *ptregs);
 #include <linux/sched.h>
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
-#include <net/lib80211.h>
-#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
-#include <linux/ieee80211.h>
-#else
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
-#include <net/ieee80211.h>
-#endif
-#endif 
-
 #ifdef CUSTOMER_HW4
 #include <linux/kthread.h>
 #endif
diff --git a/src/wl/sys/wl_linux.h b/src/wl/sys/wl_linux.h
index 5b1048e..163ebe2 100644
--- a/src/wl/sys/wl_linux.h
+++ b/src/wl/sys/wl_linux.h
@@ -106,11 +106,7 @@ struct wl_info {
 	uint32		pci_psstate[16];	
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
 #define NUM_GROUP_KEYS 4
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
-	struct lib80211_crypto_ops *tkipmodops;
-#else
-	struct ieee80211_crypto_ops *tkipmodops;	
-#endif
+	void *tkipmodops; /* unused in source */
 	struct ieee80211_tkip_data  *tkip_ucast_data;
 	struct ieee80211_tkip_data  *tkip_bcast_data[NUM_GROUP_KEYS];
 #endif 

Last edited by loqs (2025-01-23 21:05:21)

Silver Saucepan

Member

From: Bedfordshire, UK

Registered: 2023-08-01

Posts: 11

Re: 6.13.arch1-1: Wifi not working on macbookPro 2012

Working again with 6.13.2 :-)

Last edited by Silver Saucepan (2025-02-12 16:18:22)

loqs

Member

Registered: 2014-03-06

Posts: 18,868

Re: 6.13.arch1-1: Wifi not working on macbookPro 2012

Working again with 6.13.2 :-)

Please see https://gitlab.archlinux.org/archlinux/ … -/issues/2