Package: broadcom-sta-dkms
Version: 5.100.82.112-7
Followup-For: Bug #677193

The patch from that link breaks the module's compilation against a 3.2.x
kernel.

The attached patch works for me. It includes the asm headers based on
the kernel version.

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 3.4-trunk-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages broadcom-sta-dkms depends on:
ii  dkms  2.2.0.3-1.1

Versions of packages broadcom-sta-dkms recommends:
ii  wireless-tools  30~pre9-8

broadcom-sta-dkms suggests no packages.

-- no debconf information

-- debsums errors found:
debsums: changed file /usr/src/broadcom-sta-5.100.82.112/src/wl/sys/wl_linux.c 
(from broadcom-sta-dkms package)
diff -urN broadcom-sta-5.100.82.112/src/wl/sys/wl_linux.c broadcom-sta-5.100.82.112-k3.4.0/src/wl/sys/wl_linux.c
--- broadcom-sta-5.100.82.112/src/wl/sys/wl_linux.c	2012-04-17 16:25:03.000000000 +0300
+++ broadcom-sta-5.100.82.112-k3.4.0/src/wl/sys/wl_linux.c	2012-08-21 23:41:28.578729210 +0300
@@ -40,7 +40,12 @@
 #include <linux/pci_ids.h>
 #define WLC_MAXBSSCFG		1	
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)
+#include <asm/switch_to.h>
+#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
 #include <asm/system.h>
+#endif
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/pgtable.h>
@@ -390,7 +395,7 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
 	.ndo_set_rx_mode = wl_set_multicast_list,
 #else
-	.ndo_set_multicast_list = wl_set_multicast_list,
+    .ndo_set_rx_mode = wl_set_multicast_list,
 #endif
 	.ndo_do_ioctl = wl_ioctl
 };

Reply via email to