[packages/kernel-net-wl/WL-5.60] make it build with current gcc (4.8) and kernel (3.9)

[glen]

commit 4f683960ae3cc4c351fdb56354229de1faa93e52
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Jun 7 09:55:56 2013 +0300

    make it build with current gcc (4.8) and kernel (3.9)

 gcc-4.8.patch                 | 11 +++++++++++
 kernel-net-wl-linux-3.2.patch | 14 ++++++++++++++
 kernel-net-wl-linux-3.4.patch | 10 ++++++++++
 kernel-net-wl.spec            |  6 ++++++
 4 files changed, 41 insertions(+)
---
diff --git a/kernel-net-wl.spec b/kernel-net-wl.spec
index 7596b3e..85690a8 100644
--- a/kernel-net-wl.spec
+++ b/kernel-net-wl.spec
@@ -19,6 +19,9 @@ Source1:	http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86-64_v%{version
 Source2:	http://www.broadcom.com/docs/linux_sta/README.txt
 # Source2-md5:	04b0c96665b520709811a0c80a9e8ef5
 URL:		http://www.broadcom.com/support/802.11/linux_sta.php
+Patch0:		gcc-4.8.patch
+Patch1:		kernel-net-wl-linux-3.2.patch
+Patch2:		kernel-net-wl-linux-3.4.patch
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires:	rpmbuild(macros) >= 1.379
 ExclusiveArch:	%{ix86} %{x8664}
@@ -54,6 +57,9 @@ This package contains Linux module.
 %define		src 0
 %endif
 %setup -c -T -q -n %{pname}-%{version} -b%src
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 cat > Makefile << EOF
 obj-m	+= wl.o
diff --git a/gcc-4.8.patch b/gcc-4.8.patch
new file mode 100644
index 0000000..208d919
--- /dev/null
+++ b/gcc-4.8.patch
@@ -0,0 +1,11 @@
+--- wl-5.60.246.6/src/wl/sys/wl_iw.c~	2010-10-22 05:23:55.000000000 +0300
++++ wl-5.60.246.6/src/wl/sys/wl_iw.c	2013-06-07 09:48:06.790884436 +0300
+@@ -479,7 +479,7 @@
+ 		return -EINVAL;
+ 
+ 	dwrq->length = sizeof(struct iw_range);
+-	memset(range, 0, sizeof(range));
++	memset(&range, 0, sizeof(range));
+ 
+ 	range->min_nwid = range->max_nwid = 0;
+ 
diff --git a/kernel-net-wl-linux-3.2.patch b/kernel-net-wl-linux-3.2.patch
new file mode 100644
index 0000000..f78a9cf
--- /dev/null
+++ b/kernel-net-wl-linux-3.2.patch
@@ -0,0 +1,14 @@
+--- wl-5.60.246.6/src/wl/sys/wl_linux.c~	2013-06-07 09:49:13.000000000 +0300
++++ wl-5.60.246.6/src/wl/sys/wl_linux.c	2013-06-07 09:51:00.968454972 +0300
+@@ -216,7 +216,11 @@
+ 	.ndo_start_xmit = wl_start,
+ 	.ndo_get_stats = wl_get_stats,
+ 	.ndo_set_mac_address = wl_set_mac_address,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
+ 	.ndo_set_multicast_list = wl_set_multicast_list,
++#else
++	.ndo_set_rx_mode = wl_set_multicast_list,
++#endif
+ 	.ndo_do_ioctl = wl_ioctl
+ };
+ #endif 
diff --git a/kernel-net-wl-linux-3.4.patch b/kernel-net-wl-linux-3.4.patch
new file mode 100644
index 0000000..74843ef
--- /dev/null
+++ b/kernel-net-wl-linux-3.4.patch
@@ -0,0 +1,10 @@
+--- wl-5.60.246.6/src/wl/sys/wl_linux.c	2010-10-22 05:23:55.000000000 +0300
++++ wl-5.100.82.112/src/wl/sys/wl_linux.c	2013-06-07 09:36:49.884814827 +0300
+@@ -45,4 +45,7 @@
++
++#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>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel-net-wl.git/commitdiff/4f683960ae3cc4c351fdb56354229de1faa93e52