Author: cnolan Update of /cvs/nonfree/rpms/wl-kmod/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv20427 Modified Files: .cvsignore sources wl-kmod.spec Added Files: broadcom-wl-5.10.91.9-license.patch broadcom-wl-5.10.91.9-linux-2.6.29.patch broadcom-wl-5.10.91.9-linux-2.6.30.patch Removed Files: broadcom-wl-5.10.79.10-linux-2.6.29.patch Log Message: * Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com&gt; - 5.10.91.9-1 - updated to 5.10.91.9 broadcom-wl-5.10.91.9-license.patch: --- NEW FILE broadcom-wl-5.10.91.9-license.patch --- diff -Naur hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c --- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c 2009-04-23 02:48:59.000000000 +0900 +++ hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c 2009-05-08 00:48:20.000000000 +0900 @@ -170,6 +170,8 @@ static void wl_free_if(wl_info_t *wl, wl_if_t *wlif); static void wl_get_driver_info(struct net_device *dev, struct ethtool_drvinfo *info); +MODULE_LICENSE("MIXED/Proprietary"); + static struct pci_device_id wl_id_table[] = { { PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, broadcom-wl-5.10.91.9-linux-2.6.29.patch: --- NEW FILE broadcom-wl-5.10.91.9-linux-2.6.29.patch --- diff -Naur hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_iw.c hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_iw.c --- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_iw.c 2009-04-23 02:46:35.000000000 +0900 +++ hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_iw.c 2009-05-08 00:42:45.000000000 +0900 @@ -610,7 +610,11 @@ char *extra ) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) + wl_iw_t *iw = netdev_priv(dev); +#else wl_iw_t *iw = dev->priv; +#endif struct sockaddr *addr = (struct sockaddr *) extra; int i; @@ -635,7 +639,11 @@ char *extra ) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) + wl_iw_t *iw = netdev_priv(dev); +#else wl_iw_t *iw = dev->priv; +#endif struct sockaddr *addr = (struct sockaddr *) extra; struct iw_quality *qual = (struct iw_quality *) &addr[iw->spy_num]; int i; @@ -1110,7 +1118,11 @@ char *extra ) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) + wl_iw_t *iw = netdev_priv(dev); +#else wl_iw_t *iw = dev->priv; +#endif WL_TRACE(("%s: SIOCSIWNICKN\n", dev->name)); @@ -1134,7 +1146,11 @@ char *extra ) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) + wl_iw_t *iw = netdev_priv(dev); +#else wl_iw_t *iw = dev->priv; +#endif WL_TRACE(("%s: SIOCGIWNICKN\n", dev->name)); @@ -1790,7 +1806,11 @@ int paramid; int paramval; int val = 0; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) + wl_iw_t *iw = netdev_priv(dev); +#else wl_iw_t *iw = dev->priv; +#endif WL_TRACE(("%s: SIOCSIWAUTH\n", dev->name)); @@ -1921,7 +1941,11 @@ int paramid; int paramval = 0; int val; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) + wl_iw_t *iw = netdev_priv(dev); +#else wl_iw_t *iw = dev->priv; +#endif WL_TRACE(("%s: SIOCGIWAUTH\n", dev->name)); diff -Naur hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c --- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c 2009-04-23 02:48:59.000000000 +0900 +++ hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c 2009-05-08 00:45:29.000000000 +0900 @@ -53,6 +53,9 @@ #include <linux/pci_ids.h> #define WLC_MAXBSSCFG 1 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) +#include <net/lib80211.h> +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) #include <net/ieee80211.h> #endif @@ -130,7 +133,11 @@ u8 rx_hdr[16], tx_hdr[16]; }; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) +#define WL_DEV_IF(dev) ((wl_if_t*)netdev_priv(dev)) +#else #define WL_DEV_IF(dev) ((wl_if_t*)(dev)->priv) +#endif #define WL_INFO(dev) ((wl_info_t*)(WL_DEV_IF(dev)->wl)) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) @@ -282,6 +289,9 @@ dev = wlif->dev; wl->dev = dev; wl_if_setup(dev); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) + wlif = netdev_priv(dev); +#endif dev->base_addr = regs; @@ -359,10 +369,20 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) + wl->tkipmodops = lib80211_get_crypto_ops("TKIP"); +#else wl->tkipmodops = ieee80211_get_crypto_ops("TKIP"); +#endif if (wl->tkipmodops == NULL) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) + request_module("lib80211"); + request_module("lib80211_crypt_tkip"); + wl->tkipmodops = lib80211_get_crypto_ops("TKIP"); +#else request_module("ieee80211_crypt_tkip"); wl->tkipmodops = ieee80211_get_crypto_ops("TKIP"); +#endif } #endif #ifdef CONFIG_WIRELESS_EXT @@ -666,7 +686,11 @@ } if (wl->monitor) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) + wl_free_if(wl, (wl_if_t *)netdev_priv(wl->monitor)); +#else wl_free_if(wl, (wl_if_t *)(wl->monitor->priv)); +#endif wl->monitor = NULL; } @@ -833,7 +857,10 @@ strncpy(dev->name, name, IFNAMSIZ); #else - dev = alloc_netdev(0, name, ether_setup); + dev = alloc_netdev(sizeof(wl_if_t), name, ether_setup); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) + wlif = netdev_priv(dev); +#endif if (!dev) { MFREE(wl->osh, wlif, sizeof(wl_if_t)); WL_ERROR(("wl%d: wl_alloc_if: out of memory, alloc_netdev\n", @@ -847,7 +874,9 @@ wlif->wl = wl; wlif->wlcif = wlcif; wlif->subunit = subunit; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) dev->priv = wlif; +#endif if (iftype != WL_IFTYPE_MON && wl->dev && netif_queue_stopped(wl->dev)) netif_stop_queue(dev); diff -Naur hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.h hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.h --- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.h 2009-04-23 02:49:04.000000000 +0900 +++ hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.h 2009-05-08 00:42:45.000000000 +0900 @@ -85,10 +85,16 @@ bool resched; uint32 pci_psstate[16]; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) + struct lib80211_crypto_ops *tkipmodops; + struct lib80211_tkip_data *tkip_ucast_data; + struct lib80211_tkip_data *tkip_bcast_data; +#else struct ieee80211_crypto_ops *tkipmodops; struct ieee80211_tkip_data *tkip_ucast_data; struct ieee80211_tkip_data *tkip_bcast_data; #endif +#endif uint stats_id; broadcom-wl-5.10.91.9-linux-2.6.30.patch: --- NEW FILE broadcom-wl-5.10.91.9-linux-2.6.30.patch --- diff -Naur hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_iw.c hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_iw.c --- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c 2009-04-23 21:16:26.637443671 +0400 +++ hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c 2009-04-23 21:17:58.842687327 +0400 @@ -56,9 +56,13 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) #include <net/lib80211.h> #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) +#include <linux/ieee80211.h> +#else #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) #include <net/ieee80211.h> #endif +#endif #include <asm/system.h> #include <asm/io.h> Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/wl-kmod/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 Mar 2009 21:06:13 -0000 1.6 +++ .cvsignore 19 Sep 2009 12:24:55 -0000 1.7 @@ -1,2 +1,2 @@ -hybrid-portsrc-x86_32-v5_10_79_10.tar.gz -hybrid-portsrc-x86_64-v5_10_79_10.tar.gz +hybrid-portsrc-x86_32-v5_10_91_9.tar.gz +hybrid-portsrc-x86_64-v5_10_91_9.tar.gz Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/wl-kmod/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Mar 2009 21:06:13 -0000 1.6 +++ sources 19 Sep 2009 12:24:55 -0000 1.7 @@ -1,2 +1,2 @@ -7dd0b216ce8b9b4289425e6a71628232 hybrid-portsrc-x86_32-v5_10_79_10.tar.gz -72af629785af3777bc7398f742fb87af hybrid-portsrc-x86_64-v5_10_79_10.tar.gz +8c538fedcc48df17668bd2b4ee424549 hybrid-portsrc-x86_32-v5_10_91_9.tar.gz +39ad099c6d2b1617bbad37f7f44e57bc hybrid-portsrc-x86_64-v5_10_91_9.tar.gz Index: wl-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- wl-kmod.spec 5 Jun 2009 13:27:57 -0000 1.37 +++ wl-kmod.spec 19 Sep 2009 12:24:55 -0000 1.38 @@ -6,16 +6,18 @@ #define buildforkernels newest Name: wl-kmod -Version: 5.10.79.10 -Release: 2%{?dist}.9 +Version: 5.10.91.9 +Release: 1%{?dist} Summary: Kernel module for broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted URL: http://www.broadcom.com/support/802.11/linux_sta.php -Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5_10_79_10.... -Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5_10_79_10.... +Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5_10_91_9.t... +Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5_10_91_9.t... Source11: broadcom-wl-kmodtool-excludekernel-filterfile -Patch0: broadcom-wl-5.10.79.10-linux-2.6.29.patch +Patch0: broadcom-wl-5.10.91.9-linux-2.6.29.patch +Patch1: broadcom-wl-5.10.91.9-license.patch +Patch2: broadcom-wl-5.10.91.9-linux-2.6.30.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_bindir}/kmodtool @@ -53,6 +55,8 @@ tar xzf %{SOURCE1} %endif %patch0 -p1 -b .kernelfix +%patch1 -p1 -b .license +%patch2 -p1 -b .kernel30fix popd for kernel_version in %{?kernel_versions} ; do @@ -82,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com&gt; - 5.10.91.9-1 +- updated to 5.10.91.9 + * Fri Jun 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-2.9 - rebuild for final F11 kernel --- broadcom-wl-5.10.79.10-linux-2.6.29.patch DELETED ---