- fix building with linux 2.17

- rel 1

diff --git a/linux-3.17.patch b/linux-3.17.patch
new file mode 100644 (file)
index 0000000..edb340e
--- /dev/null
+++ b/linux-3.17.patch
@@ -0,0 +1,14 @@
+--- wl-6.30.223.248/src/wl/sys/wl_linux.c~     2014-06-26 12:42:08.000000000 +0200
++++ wl-6.30.223.248/src/wl/sys/wl_linux.c      2014-11-09 16:29:09.494680214 +0100
+@@ -1307,7 +1307,11 @@
+       dev->priv = priv_link;
+ #else
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0))
+       dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup);
++#else
++      dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN, ether_setup);
++#endif
+       if (!dev) {
+               WL_ERROR(("wl%d: %s: alloc_netdev failed\n",
+                       (wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__));

diff --git a/wl.spec b/wl.spec
index 35282f384059de8130f98b5e879436dac4578dd2..24ba90437c9d7d84d53d1f7bc7dbeab3589c5337 100644 (file)
--- a/wl.spec
+++ b/wl.spec
@@ -25,7 +25,7 @@ exit 1
 %define                kpkg    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
 %define                bkpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
 
-%define                rel     0.1
+%define                rel     1
 %define                pname   wl
 %define                file_ver        %(echo %{version} | tr . _)
 Summary:       Broadcom 802.11 a/b/g/n hybrid Linux networking device driver
@@ -41,7 +41,7 @@ Source1:      http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-%{fi
 Source2:       http://www.broadcom.com/docs/linux_sta/README.txt
 # Source2-md5: 8a6e8708a5e00ab6d841cde51d70eb1b
 Source3:       dkms.conf
-Patch0:                broadcom-sta-6.30.223.141-kernel-3.10.patch
+Patch0:                linux-3.17.patch
 URL:           http://www.broadcom.com/support/802.11/linux_sta.php
 BuildRequires: rpmbuild(macros) >= 1.678
 %{?with_dist_kernel:%{expand:%kbrs}}
@@ -122,7 +122,7 @@ EOF\
 %define src 0
 %endif
 %setup -c -T -q -n %{pname}-%{version} -b%{src}
-#%patch0 -p2
+%patch0 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f