12:15 p.m.
Author: cnolan
Update of /cvs/nonfree/rpms/wl-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11288
Modified Files:
wl-kmod.spec
Added Files:
broadcom-wl-5.60.48.36-2.6.33-kernel.patch
broadcom-wl-5.60.48.36-multicast-kernel.patch
Log Message:
* Sun Sep 26 2010 Chris Nolan <chris(a)cenolan.com> - 5.60.48.36-2
- added 2.6.33 kernel patch
- added multicast patch
broadcom-wl-5.60.48.36-2.6.33-kernel.patch:
linuxver.h | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE broadcom-wl-5.60.48.36-2.6.33-kernel.patch ---
--- src/include/linuxver.h.orig 2010-06-01 17:08:29.000000000 -0700
+++ src/include/linuxver.h 2010-06-02 11:32:51.844748000 -0700
@@ -20,7 +20,11 @@
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0))
#include <linux/config.h>
#else
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33))
#include <linux/autoconf.h>
+#else
+#include <generated/autoconf.h>
+#endif
#endif
#include <linux/module.h>
broadcom-wl-5.60.48.36-multicast-kernel.patch:
wl_linux.c | 22 +++++++++++++++++!!!!!
1 file changed, 17 insertions(+), 5 modifications(!)
--- NEW FILE broadcom-wl-5.60.48.36-multicast-kernel.patch ---
*** src/wl/sys/wl_linux.c.orig 2010-02-05 17:59:15.000000000 -0800
--- src/wl/sys/wl_linux.c 2010-07-28 18:25:36.982906000 -0700
***************
*** 1416,1422 ****
--- 1416,1427 ----
_wl_set_multicast_list(struct net_device *dev)
{
wl_info_t *wl;
+ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 33)
struct dev_mc_list *mclist;
+ #else
+ struct netdev_hw_addr *ha;
+ int num;
+ #endif
int i;
if (!dev)
***************
*** 1429,1437 ****
if (wl->pub->up) {
wl->pub->allmulti = (dev->flags & IFF_ALLMULTI)? TRUE: FALSE;
!
! for (i = 0, mclist = dev->mc_list; mclist && (i < dev->mc_count);
! i++, mclist = mclist->next) {
if (i >= MAXMULTILIST) {
wl->pub->allmulti = TRUE;
i = 0;
--- 1434,1441 ----
if (wl->pub->up) {
wl->pub->allmulti = (dev->flags & IFF_ALLMULTI)? TRUE: FALSE;
! #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 33)
! for (i = 0, mclist = dev->mc_list; mclist && (i < dev->mc_count);
i++, mclist = mclist->next) {
if (i >= MAXMULTILIST) {
wl->pub->allmulti = TRUE;
i = 0;
***************
*** 1439,1444 ****
--- 1443,1460 ----
}
wl->pub->multicast[i] = *((struct ether_addr*) mclist->dmi_addr);
}
+ #else
+ num = min_t(int, netdev_mc_count(dev), MAXMULTILIST);
+ i = 0;
+ netdev_for_each_mc_addr(ha, dev) {
+ if (i >= num) {
+ wl->pub->allmulti = TRUE;
+ i = 0;
+ break;
+ }
+ wl->pub->multicast[i] = *((struct ether_addr*) ha->addr);
+ }
+ #endif
wl->pub->nmulticast = i;
wlc_set(wl->wlc, WLC_SET_PROMISC, (dev->flags & IFF_PROMISC));
}
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-13/wl-kmod.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- wl-kmod.spec 19 Sep 2010 07:43:00 -0000 1.68
+++ wl-kmod.spec 26 Sep 2010 12:15:35 -0000 1.69
@@ -3,11 +3,11 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
Name: wl-kmod
Version: 5.60.48.36
-Release: 1%{?dist}.18
+Release: 2%{?dist}
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -16,6 +16,8 @@
Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5.60.48.36....
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
Patch0: broadcom-wl-5.60.48.36-license.patch
+Patch1: broadcom-wl-5.60.48.36-2.6.33-kernel.patch
+Patch2: broadcom-wl-5.60.48.36-multicast-kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -53,6 +55,8 @@
tar xzf %{SOURCE1}
%endif
%patch0 -p1 -b .license
+%patch1 -p1 -b .kernel
+%patch2 -p1 -b .multicast
popd
for kernel_version in %{?kernel_versions} ; do
@@ -82,6 +86,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Sep 26 2010 Chris Nolan <chris(a)cenolan.com> - 5.60.48.36-2
+- added 2.6.33 kernel patch
+- added multicast patch
+
* Sun Sep 19 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
5.60.48.36-1.18
- rebuild for new kernel