packages/kernel-net-wl branch updated. 43cfc3693d34ef625f86be916e0becb5cfb0802b

draenog draenog at pld-linux.org
Tue Jul 3 14:07:50 CEST 2012


The branch, master has been updated
       via  43cfc3693d34ef625f86be916e0becb5cfb0802b (commit)
      from  fc2364a9284ce89634bc4fcc214d6a8e11c79e15 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 43cfc3693d34ef625f86be916e0becb5cfb0802b
Author: Jan Wideł <jasw at pld-linux.org>
Date:   Tue Jul 3 09:41:23 2012 +0000

    - patch for linux-3.2+
     http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b81693d9149c598302e8eb9c20cb20330d922c8e
    - patch for linux-3.4+
    - patches addapted from: https://launchpad.net/ubuntu/+source/bcmwl/5.100.82.38+bdcom-0ubuntu7
    - work on 3.3.7 x86_64
    - rel++
    
    Changed files:
        kernel-net-wl-linux-3.2.patch -> 1.1
        kernel-net-wl-linux-3.4.patch -> 1.1
        kernel-net-wl.spec -> 1.16

diff --git a/kernel-net-wl-linux-3.2.patch b/kernel-net-wl-linux-3.2.patch
new file mode 100644
index 0000000..4e1be81
--- /dev/null
+++ b/kernel-net-wl-linux-3.2.patch
@@ -0,0 +1,10 @@
+--- src/wl/sys/wl_linux.c	2012-02-07 22:50:48.712066171 +0200
++++ src/wl/sys/wl_linux.c	2012-02-07 22:52:12.108479718 +0200
+@@ -391,7 +391,7 @@
+ #endif
+ 	.ndo_get_stats = wl_get_stats,
+ 	.ndo_set_mac_address = wl_set_mac_address,
+-	.ndo_set_multicast_list = wl_set_multicast_list,
++	.ndo_set_rx_mode = wl_set_multicast_list,
+ 	.ndo_do_ioctl = wl_ioctl
+ };
diff --git a/kernel-net-wl-linux-3.4.patch b/kernel-net-wl-linux-3.4.patch
new file mode 100644
index 0000000..e39be98
--- /dev/null
+++ b/kernel-net-wl-linux-3.4.patch
@@ -0,0 +1,12 @@
+--- src/wl/sys/wl_linux.c
++++ src/wl/sys/wl_linux.c
+@@ -40,7 +40,9 @@
+ #include <linux/pci_ids.h>
+ #define WLC_MAXBSSCFG		1	
+ 
++#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>
diff --git a/kernel-net-wl.spec b/kernel-net-wl.spec
index a3c41e9..85df26c 100644
--- a/kernel-net-wl.spec
+++ b/kernel-net-wl.spec
@@ -4,7 +4,7 @@
 
 %define		_enable_debug_packages	0
 
-%define		rel	1
+%define		rel	2
 %define		pname	wl
 Summary:	Linux kernel module for BCM network cards
 Name:		%{pname}%{_alt_kernel}
@@ -20,6 +20,8 @@ Source1:	http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v%{file_ve
 Source2:	http://www.broadcom.com/docs/linux_sta/README.txt
 # Source2-md5:	24976921c7b8854ed2cd56fbc5b1c13c
 Patch0:		broadcom-sta_4_kernel-2.6.37.patch
+Patch1:		kernel-net-wl-linux-3.2.patch
+Patch2:		kernel-net-wl-linux-3.4.patch
 URL:		http://www.broadcom.com/support/802.11/linux_sta.php
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires:	rpmbuild(macros) >= 1.379
@@ -57,6 +59,8 @@ This package contains Linux module.
 %endif
 %setup -c -T -q -n %{pname}-%{version} -b%src
 %patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 cat > Makefile << EOF
 obj-m	+= wl.o

-----------------------------------------------------------------------

Summary of changes:
 kernel-net-wl-linux-3.2.patch | 10 ++++++++++
 kernel-net-wl-linux-3.4.patch | 12 ++++++++++++
 kernel-net-wl.spec            |  6 +++++-
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 kernel-net-wl-linux-3.2.patch
 create mode 100644 kernel-net-wl-linux-3.4.patch


hooks/post-receive
-- 
packages/kernel-net-wl


More information about the test mailing list