January 2009 - rpmfusion-commits

by Karel Volný

Author: kvolny Update of /cvs/nonfree/rpms/ufoai/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv27356 Modified Files: ufoai.spec Log Message: * Thu Dec 11 2008 Karel Volny <kvolny(a)redhat.com> 2.2.1-3 - Fixed unowned directories (bug #225) Index: ufoai.spec =================================================================== RCS file: /cvs/nonfree/rpms/ufoai/devel/ufoai.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ufoai.spec 11 Dec 2008 15:06:58 -0000 1.2 +++ ufoai.spec 14 Jan 2009 11:47:28 -0000 1.3 @@ -140,7 +140,9 @@ %doc %{_docdir}/%{name}-%{version}/COPYING %{_bindir}/* %{_libdir}/%{name}/ -%{_datadir}/applications/ +%{_datadir}/applications/* +%dir %{_datadir}/icons/hicolor/ +%dir %{_datadir}/icons/hicolor/32x32/ %{_datadir}/icons/hicolor/32x32/apps/

15 years, 10 months

1
0
0 / 0

rpms/open-vm-tools-kmod/devel open-vm-tools-137496-kern.patch, NONE, 1.1 open-vm-tools-kmod.spec, 1.13, 1.14

by Denis Leroy

Author: denis Update of /cvs/free/rpms/open-vm-tools-kmod/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv7767 Modified Files: open-vm-tools-kmod.spec Added Files: open-vm-tools-137496-kern.patch Log Message: Added patch to fix compilation with latest rawhide module open-vm-tools-137496-kern.patch: --- NEW FILE open-vm-tools-137496-kern.patch --- diff -ru open-vm-tools-2008.12.23-137496.orig/modules/linux/vmhgfs/file.c open-vm-tools-2008.12.23-137496/modules/linux/vmhgfs/file.c --- open-vm-tools-2008.12.23-137496.orig/modules/linux/vmhgfs/file.c 2008-12-24 09:02:13.000000000 +0100 +++ open-vm-tools-2008.12.23-137496/modules/linux/vmhgfs/file.c 2009-01-13 10:01:45.000000000 +0100 @@ -634,7 +634,7 @@ iparent = dparent->d_inode; HgfsSetUidGid(iparent, file->f_dentry, - current->fsuid, current->fsgid); + current_fsuid(), current_fsgid()); dput(dparent); } diff -ru open-vm-tools-2008.12.23-137496.orig/modules/linux/vmhgfs/filesystem.c open-vm-tools-2008.12.23-137496/modules/linux/vmhgfs/filesystem.c --- open-vm-tools-2008.12.23-137496.orig/modules/linux/vmhgfs/filesystem.c 2008-12-24 09:02:13.000000000 +0100 +++ open-vm-tools-2008.12.23-137496/modules/linux/vmhgfs/filesystem.c 2009-01-13 10:04:30.000000000 +0100 @@ -256,13 +256,13 @@ if (si->uidSet) { si->uid = mountInfo->uid; } else { - si->uid = current->uid; + si->uid = current_uid(); } si->gidSet = mountInfo->gidSet; if (si->gidSet) { si->gid = mountInfo->gid; } else { - si->gid = current->gid; + si->gid = current_gid(); } si->fmask = mountInfo->fmask; si->dmask = mountInfo->dmask; diff -ru open-vm-tools-2008.12.23-137496.orig/modules/linux/vmhgfs/inode.c open-vm-tools-2008.12.23-137496/modules/linux/vmhgfs/inode.c --- open-vm-tools-2008.12.23-137496.orig/modules/linux/vmhgfs/inode.c 2008-12-24 09:02:13.000000000 +0100 +++ open-vm-tools-2008.12.23-137496/modules/linux/vmhgfs/inode.c 2009-01-13 10:07:53.000000000 +0100 @@ -1194,7 +1194,7 @@ * a Linux machine and as root, but we might as well give it * a go. */ - HgfsSetUidGid(dir, dentry, current->fsuid, current->fsgid); + HgfsSetUidGid(dir, dentry, current_fsuid(), current_fsgid()); } /* diff -ru open-vm-tools-2008.12.23-137496.orig/modules/linux/vmhgfs/page.c open-vm-tools-2008.12.23-137496/modules/linux/vmhgfs/page.c --- open-vm-tools-2008.12.23-137496.orig/modules/linux/vmhgfs/page.c 2008-12-24 09:02:13.000000000 +0100 +++ open-vm-tools-2008.12.23-137496/modules/linux/vmhgfs/page.c 2009-01-13 10:13:39.000000000 +0100 @@ -864,7 +864,7 @@ unsigned pageTo = pos + len; struct page *page; - page = __grab_cache_page(mapping, index); + page = grab_cache_page(mapping, index); if (page == NULL) { return -ENOMEM; } diff -ru open-vm-tools-2008.12.23-137496.orig/modules/linux/vmxnet/vmxnet.c open-vm-tools-2008.12.23-137496/modules/linux/vmxnet/vmxnet.c --- open-vm-tools-2008.12.23-137496.orig/modules/linux/vmxnet/vmxnet.c 2008-12-24 09:02:16.000000000 +0100 +++ open-vm-tools-2008.12.23-137496/modules/linux/vmxnet/vmxnet.c 2009-01-13 09:57:35.000000000 +0100 @@ -185,7 +185,7 @@ static int vmxnet_change_mtu(struct net_device *dev, int new_mtu) { - struct Vmxnet_Private *lp = (struct Vmxnet_Private *)dev->priv; + struct Vmxnet_Private *lp = (struct Vmxnet_Private *)netdev_priv(dev); if (new_mtu < VMXNET_MIN_MTU || new_mtu > VMXNET_MAX_MTU) { return -EINVAL; @@ -259,7 +259,7 @@ vmxnet_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo) { - struct Vmxnet_Private *lp = dev->priv; + struct Vmxnet_Private *lp = (struct Vmxnet_Private *)netdev_priv(dev); strncpy(drvinfo->driver, vmxnet_driver.name, sizeof(drvinfo->driver)); drvinfo->driver[sizeof(drvinfo->driver) - 1] = '\0'; @@ -297,7 +297,7 @@ vmxnet_set_tso(struct net_device *dev, u32 data) { if (data) { - struct Vmxnet_Private *lp = (struct Vmxnet_Private *)dev->priv; + struct Vmxnet_Private *lp = (struct Vmxnet_Private *)(struct Vmxnet_Private *)netdev_priv(dev); if (!lp->tso) { return -EINVAL; @@ -449,7 +449,8 @@ } if (value.data) { - struct Vmxnet_Private *lp = (struct Vmxnet_Private *)dev->priv; + struct Vmxnet_Private *lp = (struct Vmxnet_Private *)(struct Vmxnet_Private *)netdev_priv(dev); + if (!lp->tso) { return -EINVAL; @@ -651,7 +652,7 @@ uint32 status; int ok; - lp = dev->priv; + lp = (struct Vmxnet_Private *)netdev_priv(dev); status = inl(dev->base_addr + VMXNET_STATUS_ADDR); ok = (status & VMXNET_STATUS_CONNECTED) != 0; if (ok != netif_carrier_ok(dev)) { @@ -833,7 +834,7 @@ goto morph_back; } - lp = dev->priv; + lp = (struct Vmxnet_Private *)netdev_priv(dev); lp->pdev = pdev; dev->base_addr = ioaddr; @@ -1124,7 +1125,7 @@ vmxnet_remove_device(struct pci_dev* pdev) { struct net_device *dev = pci_get_drvdata(pdev); - struct Vmxnet_Private *lp = dev->priv; + struct Vmxnet_Private *lp = (struct Vmxnet_Private *)netdev_priv(dev); /* * Do this before device is gone so we never call netif_carrier_* after @@ -1195,7 +1196,7 @@ static int vmxnet_init_ring(struct net_device *dev) { - struct Vmxnet_Private *lp = (Vmxnet_Private *)dev->priv; + struct Vmxnet_Private *lp = (Vmxnet_Private *)(struct Vmxnet_Private *)netdev_priv(dev);; Vmxnet2_DriverData *dd = lp->dd; unsigned int i; size_t offset; @@ -1320,7 +1321,7 @@ static int vmxnet_open(struct net_device *dev) { - struct Vmxnet_Private *lp = (Vmxnet_Private *)dev->priv; + struct Vmxnet_Private *lp = (Vmxnet_Private *)(struct Vmxnet_Private *)netdev_priv(dev); unsigned int ioaddr = dev->base_addr; u32 paddr; @@ -1576,7 +1577,7 @@ static void check_tx_queue(struct net_device *dev) { - Vmxnet_Private *lp = (Vmxnet_Private *)dev->priv; + Vmxnet_Private *lp = (Vmxnet_Private *)(struct Vmxnet_Private *)netdev_priv(dev); Vmxnet2_DriverData *dd = lp->dd; int completed = 0; @@ -1640,7 +1641,7 @@ vmxnet_tx(struct sk_buff *skb, struct net_device *dev) { Vmxnet_TxStatus status = VMXNET_DEFER_TRANSMIT; - struct Vmxnet_Private *lp = (struct Vmxnet_Private *)dev->priv; + struct Vmxnet_Private *lp = (struct Vmxnet_Private *)(struct Vmxnet_Private *)netdev_priv(dev); Vmxnet2_DriverData *dd = lp->dd; unsigned long flags; Vmxnet2_TxRingEntry *xre; @@ -2039,7 +2040,7 @@ static int vmxnet_rx(struct net_device *dev) { - Vmxnet_Private *lp = (Vmxnet_Private *)dev->priv; + Vmxnet_Private *lp = (Vmxnet_Private *)(struct Vmxnet_Private *)netdev_priv(dev); Vmxnet2_DriverData *dd = lp->dd; if (!lp->devOpen) { @@ -2165,7 +2166,7 @@ } - lp = (struct Vmxnet_Private *)dev->priv; + lp = (struct Vmxnet_Private *)netdev_priv(dev); outl(VMXNET_CMD_INTR_ACK, dev->base_addr + VMXNET_COMMAND_ADDR); dd = lp->dd; @@ -2247,7 +2248,7 @@ vmxnet_close(struct net_device *dev) { unsigned int ioaddr = dev->base_addr; - Vmxnet_Private *lp = (Vmxnet_Private *)dev->priv; + Vmxnet_Private *lp = (struct Vmxnet_Private *)netdev_priv(dev); int i; unsigned long flags; @@ -2337,7 +2338,7 @@ static int vmxnet_load_multicast (struct net_device *dev) { - Vmxnet_Private *lp = (Vmxnet_Private *) dev->priv; + Vmxnet_Private *lp = (struct Vmxnet_Private *)netdev_priv(dev); volatile u16 *mcast_table = (u16 *)lp->dd->LADRF; struct dev_mc_list *dmi = dev->mc_list; char *addrs; @@ -2398,7 +2399,7 @@ vmxnet_set_multicast_list(struct net_device *dev) { unsigned int ioaddr = dev->base_addr; - Vmxnet_Private *lp = (Vmxnet_Private *)dev->priv; + Vmxnet_Private *lp = (struct Vmxnet_Private *)netdev_priv(dev); lp->dd->ifflags = ~(VMXNET_IFF_PROMISC |VMXNET_IFF_BROADCAST @@ -2478,7 +2479,7 @@ static struct net_device_stats * vmxnet_get_stats(struct net_device *dev) { - Vmxnet_Private *lp = (Vmxnet_Private *)dev->priv; + Vmxnet_Private *lp = (struct Vmxnet_Private *)netdev_priv(dev); return &lp->stats; } diff -ru open-vm-tools-2008.12.23-137496.orig/modules/linux/vmxnet3/compat_netdevice.h open-vm-tools-2008.12.23-137496/modules/linux/vmxnet3/compat_netdevice.h --- open-vm-tools-2008.12.23-137496.orig/modules/linux/vmxnet3/compat_netdevice.h 2008-12-24 09:02:17.000000000 +0100 +++ open-vm-tools-2008.12.23-137496/modules/linux/vmxnet3/compat_netdevice.h 2009-01-13 10:08:53.000000000 +0100 @@ -266,7 +266,7 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) #define compat_netif_napi_add(dev, napi, poll, quota) \ netif_napi_add(dev, napi, poll, quota) -#define compat_netif_rx_schedule(dev, napi) netif_rx_schedule(dev, napi) +#define compat_netif_rx_schedule(dev, napi) netif_rx_schedule(napi) #define compat_napi_enable(dev, napi) napi_enable(napi) #define compat_napi_disable(dev, napi) napi_disable(napi) #else diff -ru open-vm-tools-2008.12.23-137496.orig/modules/linux/vmxnet3/vmxnet3.c open-vm-tools-2008.12.23-137496/modules/linux/vmxnet3/vmxnet3.c --- open-vm-tools-2008.12.23-137496.orig/modules/linux/vmxnet3/vmxnet3.c 2008-12-24 09:02:17.000000000 +0100 +++ open-vm-tools-2008.12.23-137496/modules/linux/vmxnet3/vmxnet3.c 2009-01-13 10:12:45.000000000 +0100 @@ -380,12 +380,11 @@ { struct vmxnet3_adapter *adapter = container_of(napi, struct vmxnet3_adapter, napi); int rxd_done, txd_done; - struct net_device *netdev = adapter->netdev; vmxnet3_do_poll(adapter, budget, &txd_done, &rxd_done); if (rxd_done < budget) { - netif_rx_complete(netdev, napi); + netif_rx_complete(napi); vmxnet3_enable_intr(adapter, 0); } return rxd_done; @@ -409,7 +408,7 @@ vmxnet3_poll(struct net_device *poll_dev, int *budget) { int rxd_done, txd_done, quota; - struct vmxnet3_adapter *adapter = poll_dev->priv; + struct vmxnet3_adapter *adapter = netdev_priv(poll_dev); quota = min(*budget, poll_dev->quota); @@ -451,7 +450,7 @@ #endif { struct net_device *dev = dev_id; - struct vmxnet3_adapter *adapter = dev->priv; + struct vmxnet3_adapter *adapter = netdev_priv(dev); if (UNLIKELY(adapter->intr.type == VMXNET3_IT_INTX)) { uint32 icr = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_ICR); Index: open-vm-tools-kmod.spec =================================================================== RCS file: /cvs/free/rpms/open-vm-tools-kmod/devel/open-vm-tools-kmod.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- open-vm-tools-kmod.spec 11 Jan 2009 10:40:43 -0000 1.13 +++ open-vm-tools-kmod.spec 13 Jan 2009 09:46:51 -0000 1.14 @@ -12,13 +12,14 @@ Name: open-vm-tools-kmod Version: 0.0.0.%{buildver} -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: VMware Tools Kernel Modules Group: System Environment/Kernel License: GPLv2 URL: http://open-vm-tools.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{tname}/%{tname}-%{builddate}-%{buildve... Source11: %{tname}-excludekernel-filterfile +Patch0: open-vm-tools-137496-kern.patch BuildRoot: %{_tmppath}/%{name}-%{builddate}-%{release}-root-%(%{__id_u} -n) # VMWare only supports x86 architectures. @@ -44,6 +45,7 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %setup -q -n open-vm-tools-%{builddate}-%{buildver} +%patch0 -p1 -b .kern for kernel_version in %{?kernel_versions} ; do cp -ar modules/linux _kmod_build_${kernel_version%%___*} done @@ -52,7 +54,7 @@ %build for kernel_version in %{?kernel_versions} ; do for ovtmodule in %{ovtmodules}; do - make -C ${PWD}/_kmod_build_${kernel_version%%___*}/${ovtmodule} VM_UNAME=${kernel_version%%___*} HEADER_DIR="${kernel_version##*___}/include" + make -C ${PWD}/_kmod_build_${kernel_version%%___*}/${ovtmodule} VM_UNAME=${kernel_version%%___*} HEADER_DIR="${kernel_version##*___}/include" CC_OPTS=-DVMW_HAVE_EPOLL done done @@ -73,6 +75,9 @@ %changelog +* Tue Jan 13 2009 Denis Leroy <denis(a)poolshark.org> - 0.0.0.137496-2 +- Added patch to fix compilation with latest rawhide kernel + * Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.0.137496-1.1 - rebuild for latest Fedora kernel;

15 years, 10 months

1
0
0 / 0

rpms/yabause/F-9 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 yabause.spec, 1.4, 1.5

by Julian Sikorski

Author: belegdol Update of /cvs/free/rpms/yabause/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv9803 Modified Files: .cvsignore sources yabause.spec Log Message: * Tue Jan 13 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.9-1 - Updated to 0.9.9 - Re-enabled parallel build Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/yabause/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Dec 2008 09:31:51 -0000 1.4 +++ .cvsignore 13 Jan 2009 00:11:35 -0000 1.5 @@ -1 +1 @@ -yabause-0.9.8.tar.gz +yabause-0.9.9.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/yabause/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Dec 2008 09:31:51 -0000 1.4 +++ sources 13 Jan 2009 00:11:35 -0000 1.5 @@ -1 +1 @@ -3649b60399ac416974639b3513361a97 yabause-0.9.8.tar.gz +88109159ad294dbb00ada7536a07dcad yabause-0.9.9.tar.gz Index: yabause.spec =================================================================== RCS file: /cvs/free/rpms/yabause/F-9/yabause.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- yabause.spec 17 Dec 2008 09:31:51 -0000 1.4 +++ yabause.spec 13 Jan 2009 00:11:35 -0000 1.5 @@ -1,5 +1,5 @@ Name: yabause -Version: 0.9.8 +Version: 0.9.9 Release: 1%{?dist} Summary: A Sega Saturn emulator Group: Applications/Emulators @@ -37,7 +37,7 @@ %build %configure --with-gtk --enable-newperinterface -make +make %{?_smp_mflags} %install @@ -84,6 +84,10 @@ %changelog +* Tue Jan 13 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.9-1 +- Updated to 0.9.9 +- Re-enabled parallel build + * Wed Dec 17 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.8-1 - Updated to 0.9.8 - Dropped obsolete docs

15 years, 10 months

1
0
0 / 0

rpms/yabause/F-10 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 yabause.spec, 1.4, 1.5

by Julian Sikorski

Author: belegdol Update of /cvs/free/rpms/yabause/F-10 In directory se02.es.rpmfusion.net:/tmp/cvs-serv9701 Modified Files: .cvsignore sources yabause.spec Log Message: * Tue Jan 13 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.9-1 - Updated to 0.9.9 - Re-enabled parallel build Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/yabause/F-10/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Dec 2008 09:31:29 -0000 1.4 +++ .cvsignore 13 Jan 2009 00:11:24 -0000 1.5 @@ -1 +1 @@ -yabause-0.9.8.tar.gz +yabause-0.9.9.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/yabause/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Dec 2008 09:31:29 -0000 1.4 +++ sources 13 Jan 2009 00:11:24 -0000 1.5 @@ -1 +1 @@ -3649b60399ac416974639b3513361a97 yabause-0.9.8.tar.gz +88109159ad294dbb00ada7536a07dcad yabause-0.9.9.tar.gz Index: yabause.spec =================================================================== RCS file: /cvs/free/rpms/yabause/F-10/yabause.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- yabause.spec 17 Dec 2008 09:31:29 -0000 1.4 +++ yabause.spec 13 Jan 2009 00:11:24 -0000 1.5 @@ -1,5 +1,5 @@ Name: yabause -Version: 0.9.8 +Version: 0.9.9 Release: 1%{?dist} Summary: A Sega Saturn emulator Group: Applications/Emulators @@ -37,7 +37,7 @@ %build %configure --with-gtk --enable-newperinterface -make +make %{?_smp_mflags} %install @@ -84,6 +84,10 @@ %changelog +* Tue Jan 13 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.9-1 +- Updated to 0.9.9 +- Re-enabled parallel build + * Wed Dec 17 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.8-1 - Updated to 0.9.8 - Dropped obsolete docs

15 years, 10 months

1
0
0 / 0

rpms/yabause/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 yabause.spec, 1.4, 1.5

by Julian Sikorski

Author: belegdol Update of /cvs/free/rpms/yabause/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv9593 Modified Files: .cvsignore sources yabause.spec Log Message: * Tue Jan 13 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.9-1 - Updated to 0.9.9 - Re-enabled parallel build Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/yabause/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Dec 2008 09:31:40 -0000 1.4 +++ .cvsignore 13 Jan 2009 00:11:12 -0000 1.5 @@ -1 +1 @@ -yabause-0.9.8.tar.gz +yabause-0.9.9.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/yabause/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Dec 2008 09:31:40 -0000 1.4 +++ sources 13 Jan 2009 00:11:12 -0000 1.5 @@ -1 +1 @@ -3649b60399ac416974639b3513361a97 yabause-0.9.8.tar.gz +88109159ad294dbb00ada7536a07dcad yabause-0.9.9.tar.gz Index: yabause.spec =================================================================== RCS file: /cvs/free/rpms/yabause/devel/yabause.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- yabause.spec 17 Dec 2008 09:31:40 -0000 1.4 +++ yabause.spec 13 Jan 2009 00:11:12 -0000 1.5 @@ -1,5 +1,5 @@ Name: yabause -Version: 0.9.8 +Version: 0.9.9 Release: 1%{?dist} Summary: A Sega Saturn emulator Group: Applications/Emulators @@ -37,7 +37,7 @@ %build %configure --with-gtk --enable-newperinterface -make +make %{?_smp_mflags} %install @@ -84,6 +84,10 @@ %changelog +* Tue Jan 13 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.9-1 +- Updated to 0.9.9 +- Re-enabled parallel build + * Wed Dec 17 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.8-1 - Updated to 0.9.8 - Dropped obsolete docs

15 years, 10 months

1
0
0 / 0

rpms/akmods/devel akmods,1.1,1.2 akmods.spec,1.1,1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/akmods/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv30732 Modified Files: akmods akmods.spec Log Message: * Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.3.4-1 - update to 0.3.4, which has some cosmetic changes Index: akmods =================================================================== RCS file: /cvs/free/rpms/akmods/devel/akmods,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- akmods 2 Oct 2008 17:28:11 -0000 1.1 +++ akmods 11 Jan 2009 16:02:15 -0000 1.2 @@ -174,8 +174,8 @@ # if there are no akmod packages installed there is nothing to do for us if ! ls /usr/src/akmods/*-kmod.latest &> /dev/null ; then - echo -n "No akmod packages found." >&2 - echo_failure; echo; exit 1 + echo -n "No akmod packages found, nothing to do." >&2 + echo_success; echo; exit 1 fi @@ -357,7 +357,7 @@ if ! check_kmod_up2date ${this_kernelver} ${this_kmodname} ; then # okay, kmod wasn't found or is not up2date if [[ "${continue_line}" ]]; then - akmods_echo 1 2 --warning + akmods_echo 1 2 --success # if the files for building modules are not avilable don't even try to build modules if [[ ! -r /usr/src/kernels/"${this_kernelver}"/Makefile ]] || [[ ! -r /lib/modules/${this_kernelver}/build/Makefile ]]; then akmods_echo 1 2 "Files needed for building modules against kernel" Index: akmods.spec =================================================================== RCS file: /cvs/free/rpms/akmods/devel/akmods.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- akmods.spec 2 Oct 2008 17:28:11 -0000 1.1 +++ akmods.spec 11 Jan 2009 16:02:15 -0000 1.2 @@ -1,6 +1,6 @@ Name: akmods -Version: 0.3.3 -Release: 2%{?dist} +Version: 0.3.4 +Release: 1%{?dist} Summary: Automatic kmods build and install tool Group: System Environment/Kernel @@ -101,6 +101,9 @@ %{_mandir}/man1/* %changelog +* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.3.4-1 +- update to 0.3.4, which has some cosmetic changes + * Thu Oct 02 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.3.3-2 - rebuild for rpm fusion

15 years, 10 months

1
0
0 / 0

rpms/rt2860-kmod/F-10 rt2860-kmod.spec,1.21,1.22

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/rt2860-kmod/F-10 In directory se02.es.rpmfusion.net:/tmp/cvs-serv29017 Modified Files: rt2860-kmod.spec Log Message: re-enable %define buildforkernels newest Index: rt2860-kmod.spec =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/F-10/rt2860-kmod.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- rt2860-kmod.spec 11 Jan 2009 15:39:28 -0000 1.21 +++ rt2860-kmod.spec 11 Jan 2009 15:41:20 -0000 1.22 @@ -3,7 +3,7 @@ # "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: rt2860-kmod Version: 1.8.0.0

15 years, 10 months

1
0
0 / 0

rpms/rt2860-kmod/devel rt2860-kmod.spec,1.23,1.24

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/rt2860-kmod/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv28923 Modified Files: rt2860-kmod.spec Log Message: re-enable %define buildforkernels newest Index: rt2860-kmod.spec =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/devel/rt2860-kmod.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- rt2860-kmod.spec 11 Jan 2009 15:28:40 -0000 1.23 +++ rt2860-kmod.spec 11 Jan 2009 15:40:30 -0000 1.24 @@ -3,7 +3,7 @@ # "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: rt2860-kmod Version: 1.8.0.0

15 years, 10 months

1
0
0 / 0

rpms/rt2860-kmod/F-10 rt2860-2.6.29-compile.patch, NONE, 1.1 rt2860-kmod.spec, 1.20, 1.21

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/rt2860-kmod/F-10 In directory se02.es.rpmfusion.net:/tmp/cvs-serv28774 Modified Files: rt2860-kmod.spec Added Files: rt2860-2.6.29-compile.patch Log Message: * Sun Jan 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.8.0.0-3 - Add a patch for compilation against kernels >= 2.6.29 rt2860-2.6.29-compile.patch: --- NEW FILE rt2860-2.6.29-compile.patch --- diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/include/rt2860.h new/2008_0918_RT2860_Linux_STA_v1.8.0.0/include/rt2860.h --- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/include/rt2860.h 2008-09-10 21:23:56.000000000 -0400 +++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/include/rt2860.h 2009-01-11 02:08:03.000000000 -0500 @@ -242,7 +242,7 @@ rt2860_interrupt(int irq, void *dev_inst #endif #define RT28XX_IRQ_REQUEST(net_dev) \ -{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->priv); \ +{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->ml_priv); \ POS_COOKIE _pObj = (POS_COOKIE)(_pAd->OS_Cookie); \ RTMP_MSI_ENABLE(_pAd); \ if ((retval = request_irq(_pObj->pci_dev->irq, \ @@ -253,14 +253,14 @@ rt2860_interrupt(int irq, void *dev_inst #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) #define RT28XX_IRQ_RELEASE(net_dev) \ -{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->priv); \ +{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->ml_priv); \ POS_COOKIE _pObj = (POS_COOKIE)(_pAd->OS_Cookie); \ synchronize_irq(_pObj->pci_dev->irq); \ free_irq(_pObj->pci_dev->irq, (net_dev)); \ RTMP_MSI_DISABLE(_pAd); } #else #define RT28XX_IRQ_RELEASE(net_dev) \ -{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->priv); \ +{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->ml_priv); \ POS_COOKIE _pObj = (POS_COOKIE)(_pAd->OS_Cookie); \ free_irq(_pObj->pci_dev->irq, (net_dev)); \ RTMP_MSI_DISABLE(_pAd); } diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/2860_main_dev.c new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/2860_main_dev.c --- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/2860_main_dev.c 2008-09-10 08:32:02.000000000 -0400 +++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/2860_main_dev.c 2009-01-11 02:03:33.000000000 -0500 @@ -170,7 +170,7 @@ static int rt2860_suspend( } else { - pAd = (PRTMP_ADAPTER)net_dev->priv; + pAd = (PRTMP_ADAPTER)net_dev->ml_priv; /* we can not use IFF_UP because ra0 down but ra1 up */ /* and 1 suspend/resume function for 1 module, not for each interface */ @@ -249,7 +249,7 @@ static int rt2860_resume( DBGPRINT(RT_DEBUG_ERROR, ("net_dev == NULL!\n")); } else - pAd = (PRTMP_ADAPTER)net_dev->priv; + pAd = (PRTMP_ADAPTER)net_dev->ml_priv; if (pAd != NULL) { @@ -336,7 +336,7 @@ static VOID __devexit rt2860_remove_one( IN struct pci_dev *pci_dev) { struct net_device *net_dev = pci_get_drvdata(pci_dev); - RTMP_ADAPTER *pAd = net_dev->priv; + RTMP_ADAPTER *pAd = net_dev->ml_priv; DBGPRINT(RT_DEBUG_TRACE, ("===> rt2860_remove_one\n")); @@ -765,7 +765,7 @@ rt2860_interrupt(int irq, void *dev_inst #endif { struct net_device *net_dev = (struct net_device *) dev_instance; - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->ml_priv; INT_SOURCE_CSR_STRUC IntSource; POS_COOKIE pObj; @@ -1300,7 +1300,7 @@ VOID rt2860_stop(struct net_device *net_ DBGPRINT(RT_DEBUG_ERROR, ("net_dev == NULL!\n")); } else - pAd = (PRTMP_ADAPTER)net_dev->priv; + pAd = (PRTMP_ADAPTER)net_dev->ml_priv; if (pAd != NULL) { diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_main_dev.c new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_main_dev.c --- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_main_dev.c 2008-09-10 08:39:30.000000000 -0400 +++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_main_dev.c 2009-01-11 02:00:10.000000000 -0500 @@ -135,7 +135,7 @@ Note: */ int MainVirtualIF_close(IN struct net_device *net_dev) { - RTMP_ADAPTER *pAd = net_dev->priv; + RTMP_ADAPTER *pAd = net_dev->ml_priv; // Sanity check for pAd if (pAd == NULL) @@ -174,7 +174,7 @@ Note: */ int MainVirtualIF_open(IN struct net_device *net_dev) { - RTMP_ADAPTER *pAd = net_dev->priv; + RTMP_ADAPTER *pAd = net_dev->ml_priv; // Sanity check for pAd if (pAd == NULL) @@ -216,7 +216,7 @@ Note: int rt28xx_close(IN PNET_DEV dev) { struct net_device * net_dev = (struct net_device *)dev; - RTMP_ADAPTER *pAd = net_dev->priv; + RTMP_ADAPTER *pAd = net_dev->ml_priv; BOOLEAN Cancelled = FALSE; UINT32 i = 0; @@ -396,7 +396,7 @@ int rt28xx_close(IN PNET_DEV dev) static int rt28xx_init(IN struct net_device *net_dev) { - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->ml_priv; UINT index; UCHAR TmpPhy; NDIS_STATUS Status; @@ -606,7 +606,7 @@ err1: RT28XX_IRQ_RELEASE(net_dev); // shall not set priv to NULL here because the priv didn't been free yet. - //net_dev->priv = 0; + //net_dev->ml_priv = 0; #ifdef INF_AMAZON_SE err0: #endif // INF_AMAZON_SE // @@ -633,7 +633,7 @@ Note: int rt28xx_open(IN PNET_DEV dev) { struct net_device * net_dev = (struct net_device *)dev; - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->ml_priv; int retval = 0; POS_COOKIE pObj; @@ -642,7 +642,7 @@ int rt28xx_open(IN PNET_DEV dev) if (pAd == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -1; } @@ -1303,7 +1303,7 @@ INT __devinit rt28xx_probe( if (status != NDIS_STATUS_SUCCESS) goto err_out_free_netdev; - net_dev->priv = (PVOID)pAd; + net_dev->ml_priv = (PVOID)pAd; pAd->net_dev = net_dev; // must be before RT28XXNetDevInit() RT28XXNetDevInit(_dev_p, net_dev, pAd); @@ -1399,7 +1399,7 @@ Note: int rt28xx_packet_xmit(struct sk_buff *skb) { struct net_device *net_dev = skb->dev; - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->ml_priv; int status = 0; PNDIS_PACKET pPacket = (PNDIS_PACKET) skb; @@ -1478,7 +1478,7 @@ INT rt28xx_send_packets( IN struct sk_buff *skb_p, IN struct net_device *net_dev) { - RTMP_ADAPTER *pAd = net_dev->priv; + RTMP_ADAPTER *pAd = net_dev->ml_priv; if (!(net_dev->flags & IFF_UP)) { RELEASE_NDIS_PACKET(pAd, (PNDIS_PACKET)skb_p, NDIS_STATUS_FAILURE); @@ -1519,7 +1519,7 @@ struct net_device *alloc_netdev( memset(dev, 0, alloc_size); if (sizeof_priv) - dev->priv = (void *) (((long)(dev + 1) + 31) & ~31); + dev->ml_priv = (void *) (((long)(dev + 1) + 31) & ~31); setup(dev); strcpy(dev->name, mask); @@ -1540,7 +1540,7 @@ void CfgInitHook(PRTMP_ADAPTER pAd) struct iw_statistics *rt28xx_get_wireless_stats( IN struct net_device *net_dev) { - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->ml_priv; DBGPRINT(RT_DEBUG_TRACE, ("rt28xx_get_wireless_stats --->\n")); @@ -1592,18 +1592,18 @@ INT rt28xx_ioctl( if (net_dev->priv_flags == INT_MAIN) { - pAd = net_dev->priv; + pAd = net_dev->ml_priv; } else { - pVirtualAd = net_dev->priv; - pAd = pVirtualAd->RtmpDev->priv; + pVirtualAd = net_dev->ml_priv; + pAd = pVirtualAd->RtmpDev->ml_priv; } if (pAd == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -1640,7 +1640,7 @@ struct net_device_stats *RT28xx_get_ethe RTMP_ADAPTER *pAd = NULL; if (net_dev) - pAd = net_dev->priv; + pAd = net_dev->ml_priv; if (pAd) { diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_profile.c new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_profile.c --- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_profile.c 2008-09-10 08:40:44.000000000 -0400 +++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_profile.c 2009-01-11 01:52:14.000000000 -0500 @@ -925,9 +925,9 @@ NDIS_STATUS RTMPReadParametersHook( // Save uid and gid used for filesystem access. // Set user and group to 0 (root) - orgfsuid = current->fsuid; - orgfsgid = current->fsgid; - current->fsuid=current->fsgid = 0; + orgfsuid = current_fsuid(); + orgfsgid = current_fsgid(); + /* current->fsuid=current->fsgid = 0;*/ orgfs = get_fs(); set_fs(KERNEL_DS); @@ -1551,9 +1551,10 @@ NDIS_STATUS RTMPReadParametersHook( } set_fs(orgfs); +#if 0 current->fsuid = orgfsuid; current->fsgid = orgfsgid; - +#endif kfree(buffer); kfree(tmpbuf); diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/sta_ioctl.c new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/sta_ioctl.c --- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/sta_ioctl.c 2009-01-11 01:47:07.000000000 -0500 +++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/sta_ioctl.c 2009-01-11 02:05:38.000000000 -0500 @@ -571,7 +571,7 @@ rt_ioctl_giwname(struct net_device *dev, struct iw_request_info *info, char *name, char *extra) { -// PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; +// PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; #ifdef RT2860 strncpy(name, "RT2860 Wireless", IFNAMSIZ); @@ -583,7 +583,7 @@ int rt_ioctl_siwfreq(struct net_device * struct iw_request_info *info, struct iw_freq *freq, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; int chan = -1; //check if the interface is down @@ -623,19 +623,19 @@ int rt_ioctl_giwfreq(struct net_device * if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; + pVirtualAd = dev->ml_priv; if (pVirtualAd && pVirtualAd->RtmpDev) - pAdapter = pVirtualAd->RtmpDev->priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -653,7 +653,7 @@ int rt_ioctl_siwmode(struct net_device * struct iw_request_info *info, __u32 *mode, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; //check if the interface is down if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) @@ -695,19 +695,19 @@ int rt_ioctl_giwmode(struct net_device * if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; + pVirtualAd = dev->ml_priv; if (pVirtualAd && pVirtualAd->RtmpDev) - pAdapter = pVirtualAd->RtmpDev->priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -732,7 +732,7 @@ int rt_ioctl_siwsens(struct net_device * struct iw_request_info *info, char *name, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; //check if the interface is down if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) @@ -763,19 +763,19 @@ int rt_ioctl_giwrange(struct net_device if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; + pVirtualAd = dev->ml_priv; if (pVirtualAd && pVirtualAd->RtmpDev) - pAdapter = pVirtualAd->RtmpDev->priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -857,7 +857,7 @@ int rt_ioctl_siwap(struct net_device *de struct iw_request_info *info, struct sockaddr *ap_addr, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; NDIS_802_11_MAC_ADDRESS Bssid; //check if the interface is down @@ -902,19 +902,19 @@ int rt_ioctl_giwap(struct net_device *de if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; + pVirtualAd = dev->ml_priv; if (pVirtualAd && pVirtualAd->RtmpDev) - pAdapter = pVirtualAd->RtmpDev->priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -984,7 +984,7 @@ int rt_ioctl_iwaplist(struct net_device struct iw_request_info *info, struct iw_point *data, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; struct sockaddr addr[IW_MAX_AP]; struct iw_quality qual[IW_MAX_AP]; @@ -1020,7 +1020,7 @@ int rt_ioctl_siwscan(struct net_device * struct iw_request_info *info, struct iw_point *data, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; ULONG Now; int Status = NDIS_STATUS_SUCCESS; @@ -1102,7 +1102,7 @@ int rt_ioctl_giwscan(struct net_device * struct iw_point *data, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; int i=0; char *current_ev = extra, *previous_ev = extra; char *end_buf; @@ -1391,7 +1391,7 @@ int rt_ioctl_siwessid(struct net_device struct iw_request_info *info, struct iw_point *data, char *essid) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; //check if the interface is down if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) @@ -1437,19 +1437,19 @@ int rt_ioctl_giwessid(struct net_device if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; + pVirtualAd = dev->ml_priv; if (pVirtualAd && pVirtualAd->RtmpDev) - pAdapter = pVirtualAd->RtmpDev->priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -1480,7 +1480,7 @@ int rt_ioctl_siwnickn(struct net_device struct iw_request_info *info, struct iw_point *data, char *nickname) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; //check if the interface is down if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) @@ -1508,19 +1508,19 @@ int rt_ioctl_giwnickn(struct net_device if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; + pVirtualAd = dev->ml_priv; if (pVirtualAd && pVirtualAd->RtmpDev) - pAdapter = pVirtualAd->RtmpDev->priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -1537,7 +1537,7 @@ int rt_ioctl_siwrts(struct net_device *d struct iw_request_info *info, struct iw_param *rts, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; u16 val; //check if the interface is down @@ -1571,19 +1571,19 @@ int rt_ioctl_giwrts(struct net_device *d if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; + pVirtualAd = dev->ml_priv; if (pVirtualAd && pVirtualAd->RtmpDev) - pAdapter = pVirtualAd->RtmpDev->priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -1605,7 +1605,7 @@ int rt_ioctl_siwfrag(struct net_device * struct iw_request_info *info, struct iw_param *frag, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; u16 val; //check if the interface is down @@ -1637,19 +1637,19 @@ int rt_ioctl_giwfrag(struct net_device * if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; + pVirtualAd = dev->ml_priv; if (pVirtualAd && pVirtualAd->RtmpDev) - pAdapter = pVirtualAd->RtmpDev->priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -1673,7 +1673,7 @@ int rt_ioctl_siwencode(struct net_device struct iw_request_info *info, struct iw_point *erq, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; //check if the interface is down if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) @@ -1780,19 +1780,19 @@ rt_ioctl_giwencode(struct net_device *de if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; + pVirtualAd = dev->ml_priv; if (pVirtualAd && pVirtualAd->RtmpDev) - pAdapter = pVirtualAd->RtmpDev->priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -1860,19 +1860,19 @@ rt_ioctl_setparam(struct net_device *dev if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; - pAdapter = pVirtualAd->RtmpDev->priv; + pVirtualAd = dev->ml_priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } pObj = (POS_COOKIE) pAdapter->OS_Cookie; if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -1928,7 +1928,7 @@ rt_private_get_statistics(struct net_dev struct iw_point *wrq, char *extra) { INT Status = 0; - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv; if (extra == NULL) { @@ -2055,18 +2055,18 @@ rt_private_show(struct net_device *dev, u32 subcmd = wrq->flags; if (dev->priv_flags == INT_MAIN) - pAd = dev->priv; + pAd = dev->ml_priv; else { - pVirtualAd = dev->priv; - pAd = pVirtualAd->RtmpDev->priv; + pVirtualAd = dev->ml_priv; + pAd = pVirtualAd->RtmpDev->ml_priv; } pObj = (POS_COOKIE) pAd->OS_Cookie; if (pAd == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -2213,7 +2213,7 @@ int rt_ioctl_siwmlme(struct net_device * union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv; struct iw_mlme *pMlme = (struct iw_mlme *)wrqu->data.pointer; MLME_QUEUE_ELEM MsgElem; MLME_DISASSOC_REQ_STRUCT DisAssocReq; @@ -2270,7 +2270,7 @@ int rt_ioctl_siwauth(struct net_device * struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; struct iw_param *param = &wrqu->param; //check if the interface is down @@ -2413,7 +2413,7 @@ int rt_ioctl_giwauth(struct net_device * struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; struct iw_param *param = &wrqu->param; //check if the interface is down @@ -2487,7 +2487,7 @@ int rt_ioctl_siwencodeext(struct net_dev union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; struct iw_point *encoding = &wrqu->encoding; struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; int keyIdx, alg = ext->alg; @@ -2596,7 +2596,7 @@ rt_ioctl_giwencodeext(struct net_device struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv; PCHAR pKey = NULL; struct iw_point *encoding = &wrqu->encoding; struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; @@ -2680,7 +2680,7 @@ int rt_ioctl_siwgenie(struct net_device struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv; if (wrqu->data.length > MAX_LEN_OF_RSNIE || (wrqu->data.length && extra == NULL)) @@ -2705,7 +2705,7 @@ int rt_ioctl_giwgenie(struct net_device struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv; if ((pAd->StaCfg.RSNIE_Len == 0) || (pAd->StaCfg.AuthMode < Ndis802_11AuthModeWPA)) @@ -2751,7 +2751,7 @@ int rt_ioctl_siwpmksa(struct net_device union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv; struct iw_pmksa *pPmksa = (struct iw_pmksa *)wrqu->data.pointer; INT CachedIdx = 0, idx = 0; @@ -2834,7 +2834,7 @@ rt_private_ioctl_bbp(struct net_device * UINT32 bbpValue; BOOLEAN bIsPrintAllBBP = FALSE; INT Status = 0; - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; memset(extra, 0x00, IW_PRIV_SIZE_MASK); @@ -2961,7 +2961,7 @@ int rt_ioctl_siwrate(struct net_device * struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv; UINT32 rate = wrqu->bitrate.value, fixed = wrqu->bitrate.fixed; //check if the interface is down @@ -3019,7 +3019,7 @@ int rt_ioctl_giwrate(struct net_device * struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv; int rate_index = 0, rate_count = 0; HTTRANSMIT_SETTING ht_setting; __s32 ralinkrate[] = @@ -5409,19 +5409,19 @@ INT rt28xx_sta_ioctl( if (net_dev->priv_flags == INT_MAIN) { - pAd = net_dev->priv; + pAd = net_dev->ml_priv; } else { - pVirtualAd = net_dev->priv; - pAd = pVirtualAd->RtmpDev->priv; + pVirtualAd = net_dev->ml_priv; + pAd = pVirtualAd->RtmpDev->ml_priv; } pObj = (POS_COOKIE) pAd->OS_Cookie; if (pAd == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } Index: rt2860-kmod.spec =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/F-10/rt2860-kmod.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- rt2860-kmod.spec 20 Dec 2008 07:55:28 -0000 1.20 +++ rt2860-kmod.spec 11 Jan 2009 15:39:28 -0000 1.21 @@ -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: rt2860-kmod Version: 1.8.0.0 -Release: 2%{?dist}.1 +Release: 3%{?dist} Summary: Kernel module for RaLink 802.11 wireless devices rt2760/rt2790/rt2860/rt2890 Group: System Environment/Kernel @@ -19,6 +19,7 @@ Patch1: rt2860-dat-install-fixes.patch Patch2: rt2860-add-network-mgr-support.diff Patch3: rt2860-remove-tftpboot-copy.patch +Patch5: rt2860-2.6.29-compile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_bindir}/kmodtool @@ -50,6 +51,11 @@ for kernel_version in %{?kernel_versions} ; do cp -a *RT2860_Linux_STA* _kmod_build_${kernel_version%%___*} + pushd _kmod_build_${kernel_version%%___*} + if [[ $kernel_version > "2.6.29" ]]; then +%patch5 -p2 -b .2.6.29 + fi + popd done %build @@ -70,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jan 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.8.0.0-3 +- Add a patch for compilation against kernels >= 2.6.29 + * Sat Dec 20 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.8.0.0-2.1 - rebuild for latest Fedora kernel;

15 years, 10 months

1
0
0 / 0

rpms/rt2860-kmod/devel rt2860-2.6.29-compile.patch, NONE, 1.1 rt2860-kmod.spec, 1.22, 1.23

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/rt2860-kmod/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv27787 Modified Files: rt2860-kmod.spec Added Files: rt2860-2.6.29-compile.patch Log Message: * Sun Jan 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.8.0.0-3 - Add a patch for compilation against kernels >= 2.6.29 rt2860-2.6.29-compile.patch: --- NEW FILE rt2860-2.6.29-compile.patch --- diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/include/rt2860.h new/2008_0918_RT2860_Linux_STA_v1.8.0.0/include/rt2860.h --- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/include/rt2860.h 2008-09-10 21:23:56.000000000 -0400 +++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/include/rt2860.h 2009-01-11 02:08:03.000000000 -0500 @@ -242,7 +242,7 @@ rt2860_interrupt(int irq, void *dev_inst #endif #define RT28XX_IRQ_REQUEST(net_dev) \ -{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->priv); \ +{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->ml_priv); \ POS_COOKIE _pObj = (POS_COOKIE)(_pAd->OS_Cookie); \ RTMP_MSI_ENABLE(_pAd); \ if ((retval = request_irq(_pObj->pci_dev->irq, \ @@ -253,14 +253,14 @@ rt2860_interrupt(int irq, void *dev_inst #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) #define RT28XX_IRQ_RELEASE(net_dev) \ -{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->priv); \ +{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->ml_priv); \ POS_COOKIE _pObj = (POS_COOKIE)(_pAd->OS_Cookie); \ synchronize_irq(_pObj->pci_dev->irq); \ free_irq(_pObj->pci_dev->irq, (net_dev)); \ RTMP_MSI_DISABLE(_pAd); } #else #define RT28XX_IRQ_RELEASE(net_dev) \ -{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->priv); \ +{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->ml_priv); \ POS_COOKIE _pObj = (POS_COOKIE)(_pAd->OS_Cookie); \ free_irq(_pObj->pci_dev->irq, (net_dev)); \ RTMP_MSI_DISABLE(_pAd); } diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/2860_main_dev.c new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/2860_main_dev.c --- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/2860_main_dev.c 2008-09-10 08:32:02.000000000 -0400 +++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/2860_main_dev.c 2009-01-11 02:03:33.000000000 -0500 @@ -170,7 +170,7 @@ static int rt2860_suspend( } else { - pAd = (PRTMP_ADAPTER)net_dev->priv; + pAd = (PRTMP_ADAPTER)net_dev->ml_priv; /* we can not use IFF_UP because ra0 down but ra1 up */ /* and 1 suspend/resume function for 1 module, not for each interface */ @@ -249,7 +249,7 @@ static int rt2860_resume( DBGPRINT(RT_DEBUG_ERROR, ("net_dev == NULL!\n")); } else - pAd = (PRTMP_ADAPTER)net_dev->priv; + pAd = (PRTMP_ADAPTER)net_dev->ml_priv; if (pAd != NULL) { @@ -336,7 +336,7 @@ static VOID __devexit rt2860_remove_one( IN struct pci_dev *pci_dev) { struct net_device *net_dev = pci_get_drvdata(pci_dev); - RTMP_ADAPTER *pAd = net_dev->priv; + RTMP_ADAPTER *pAd = net_dev->ml_priv; DBGPRINT(RT_DEBUG_TRACE, ("===> rt2860_remove_one\n")); @@ -765,7 +765,7 @@ rt2860_interrupt(int irq, void *dev_inst #endif { struct net_device *net_dev = (struct net_device *) dev_instance; - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->ml_priv; INT_SOURCE_CSR_STRUC IntSource; POS_COOKIE pObj; @@ -1300,7 +1300,7 @@ VOID rt2860_stop(struct net_device *net_ DBGPRINT(RT_DEBUG_ERROR, ("net_dev == NULL!\n")); } else - pAd = (PRTMP_ADAPTER)net_dev->priv; + pAd = (PRTMP_ADAPTER)net_dev->ml_priv; if (pAd != NULL) { diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_main_dev.c new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_main_dev.c --- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_main_dev.c 2008-09-10 08:39:30.000000000 -0400 +++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_main_dev.c 2009-01-11 02:00:10.000000000 -0500 @@ -135,7 +135,7 @@ Note: */ int MainVirtualIF_close(IN struct net_device *net_dev) { - RTMP_ADAPTER *pAd = net_dev->priv; + RTMP_ADAPTER *pAd = net_dev->ml_priv; // Sanity check for pAd if (pAd == NULL) @@ -174,7 +174,7 @@ Note: */ int MainVirtualIF_open(IN struct net_device *net_dev) { - RTMP_ADAPTER *pAd = net_dev->priv; + RTMP_ADAPTER *pAd = net_dev->ml_priv; // Sanity check for pAd if (pAd == NULL) @@ -216,7 +216,7 @@ Note: int rt28xx_close(IN PNET_DEV dev) { struct net_device * net_dev = (struct net_device *)dev; - RTMP_ADAPTER *pAd = net_dev->priv; + RTMP_ADAPTER *pAd = net_dev->ml_priv; BOOLEAN Cancelled = FALSE; UINT32 i = 0; @@ -396,7 +396,7 @@ int rt28xx_close(IN PNET_DEV dev) static int rt28xx_init(IN struct net_device *net_dev) { - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->ml_priv; UINT index; UCHAR TmpPhy; NDIS_STATUS Status; @@ -606,7 +606,7 @@ err1: RT28XX_IRQ_RELEASE(net_dev); // shall not set priv to NULL here because the priv didn't been free yet. - //net_dev->priv = 0; + //net_dev->ml_priv = 0; #ifdef INF_AMAZON_SE err0: #endif // INF_AMAZON_SE // @@ -633,7 +633,7 @@ Note: int rt28xx_open(IN PNET_DEV dev) { struct net_device * net_dev = (struct net_device *)dev; - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->ml_priv; int retval = 0; POS_COOKIE pObj; @@ -642,7 +642,7 @@ int rt28xx_open(IN PNET_DEV dev) if (pAd == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -1; } @@ -1303,7 +1303,7 @@ INT __devinit rt28xx_probe( if (status != NDIS_STATUS_SUCCESS) goto err_out_free_netdev; - net_dev->priv = (PVOID)pAd; + net_dev->ml_priv = (PVOID)pAd; pAd->net_dev = net_dev; // must be before RT28XXNetDevInit() RT28XXNetDevInit(_dev_p, net_dev, pAd); @@ -1399,7 +1399,7 @@ Note: int rt28xx_packet_xmit(struct sk_buff *skb) { struct net_device *net_dev = skb->dev; - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->ml_priv; int status = 0; PNDIS_PACKET pPacket = (PNDIS_PACKET) skb; @@ -1478,7 +1478,7 @@ INT rt28xx_send_packets( IN struct sk_buff *skb_p, IN struct net_device *net_dev) { - RTMP_ADAPTER *pAd = net_dev->priv; + RTMP_ADAPTER *pAd = net_dev->ml_priv; if (!(net_dev->flags & IFF_UP)) { RELEASE_NDIS_PACKET(pAd, (PNDIS_PACKET)skb_p, NDIS_STATUS_FAILURE); @@ -1519,7 +1519,7 @@ struct net_device *alloc_netdev( memset(dev, 0, alloc_size); if (sizeof_priv) - dev->priv = (void *) (((long)(dev + 1) + 31) & ~31); + dev->ml_priv = (void *) (((long)(dev + 1) + 31) & ~31); setup(dev); strcpy(dev->name, mask); @@ -1540,7 +1540,7 @@ void CfgInitHook(PRTMP_ADAPTER pAd) struct iw_statistics *rt28xx_get_wireless_stats( IN struct net_device *net_dev) { - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->ml_priv; DBGPRINT(RT_DEBUG_TRACE, ("rt28xx_get_wireless_stats --->\n")); @@ -1592,18 +1592,18 @@ INT rt28xx_ioctl( if (net_dev->priv_flags == INT_MAIN) { - pAd = net_dev->priv; + pAd = net_dev->ml_priv; } else { - pVirtualAd = net_dev->priv; - pAd = pVirtualAd->RtmpDev->priv; + pVirtualAd = net_dev->ml_priv; + pAd = pVirtualAd->RtmpDev->ml_priv; } if (pAd == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -1640,7 +1640,7 @@ struct net_device_stats *RT28xx_get_ethe RTMP_ADAPTER *pAd = NULL; if (net_dev) - pAd = net_dev->priv; + pAd = net_dev->ml_priv; if (pAd) { diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_profile.c new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_profile.c --- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_profile.c 2008-09-10 08:40:44.000000000 -0400 +++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_profile.c 2009-01-11 01:52:14.000000000 -0500 @@ -925,9 +925,9 @@ NDIS_STATUS RTMPReadParametersHook( // Save uid and gid used for filesystem access. // Set user and group to 0 (root) - orgfsuid = current->fsuid; - orgfsgid = current->fsgid; - current->fsuid=current->fsgid = 0; + orgfsuid = current_fsuid(); + orgfsgid = current_fsgid(); + /* current->fsuid=current->fsgid = 0;*/ orgfs = get_fs(); set_fs(KERNEL_DS); @@ -1551,9 +1551,10 @@ NDIS_STATUS RTMPReadParametersHook( } set_fs(orgfs); +#if 0 current->fsuid = orgfsuid; current->fsgid = orgfsgid; - +#endif kfree(buffer); kfree(tmpbuf); diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/sta_ioctl.c new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/sta_ioctl.c --- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/sta_ioctl.c 2009-01-11 01:47:07.000000000 -0500 +++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/sta_ioctl.c 2009-01-11 02:05:38.000000000 -0500 @@ -571,7 +571,7 @@ rt_ioctl_giwname(struct net_device *dev, struct iw_request_info *info, char *name, char *extra) { -// PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; +// PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; #ifdef RT2860 strncpy(name, "RT2860 Wireless", IFNAMSIZ); @@ -583,7 +583,7 @@ int rt_ioctl_siwfreq(struct net_device * struct iw_request_info *info, struct iw_freq *freq, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; int chan = -1; //check if the interface is down @@ -623,19 +623,19 @@ int rt_ioctl_giwfreq(struct net_device * if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; + pVirtualAd = dev->ml_priv; if (pVirtualAd && pVirtualAd->RtmpDev) - pAdapter = pVirtualAd->RtmpDev->priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -653,7 +653,7 @@ int rt_ioctl_siwmode(struct net_device * struct iw_request_info *info, __u32 *mode, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; //check if the interface is down if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) @@ -695,19 +695,19 @@ int rt_ioctl_giwmode(struct net_device * if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; + pVirtualAd = dev->ml_priv; if (pVirtualAd && pVirtualAd->RtmpDev) - pAdapter = pVirtualAd->RtmpDev->priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -732,7 +732,7 @@ int rt_ioctl_siwsens(struct net_device * struct iw_request_info *info, char *name, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; //check if the interface is down if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) @@ -763,19 +763,19 @@ int rt_ioctl_giwrange(struct net_device if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; + pVirtualAd = dev->ml_priv; if (pVirtualAd && pVirtualAd->RtmpDev) - pAdapter = pVirtualAd->RtmpDev->priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -857,7 +857,7 @@ int rt_ioctl_siwap(struct net_device *de struct iw_request_info *info, struct sockaddr *ap_addr, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; NDIS_802_11_MAC_ADDRESS Bssid; //check if the interface is down @@ -902,19 +902,19 @@ int rt_ioctl_giwap(struct net_device *de if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; + pVirtualAd = dev->ml_priv; if (pVirtualAd && pVirtualAd->RtmpDev) - pAdapter = pVirtualAd->RtmpDev->priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -984,7 +984,7 @@ int rt_ioctl_iwaplist(struct net_device struct iw_request_info *info, struct iw_point *data, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; struct sockaddr addr[IW_MAX_AP]; struct iw_quality qual[IW_MAX_AP]; @@ -1020,7 +1020,7 @@ int rt_ioctl_siwscan(struct net_device * struct iw_request_info *info, struct iw_point *data, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; ULONG Now; int Status = NDIS_STATUS_SUCCESS; @@ -1102,7 +1102,7 @@ int rt_ioctl_giwscan(struct net_device * struct iw_point *data, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; int i=0; char *current_ev = extra, *previous_ev = extra; char *end_buf; @@ -1391,7 +1391,7 @@ int rt_ioctl_siwessid(struct net_device struct iw_request_info *info, struct iw_point *data, char *essid) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; //check if the interface is down if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) @@ -1437,19 +1437,19 @@ int rt_ioctl_giwessid(struct net_device if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; + pVirtualAd = dev->ml_priv; if (pVirtualAd && pVirtualAd->RtmpDev) - pAdapter = pVirtualAd->RtmpDev->priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -1480,7 +1480,7 @@ int rt_ioctl_siwnickn(struct net_device struct iw_request_info *info, struct iw_point *data, char *nickname) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; //check if the interface is down if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) @@ -1508,19 +1508,19 @@ int rt_ioctl_giwnickn(struct net_device if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; + pVirtualAd = dev->ml_priv; if (pVirtualAd && pVirtualAd->RtmpDev) - pAdapter = pVirtualAd->RtmpDev->priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -1537,7 +1537,7 @@ int rt_ioctl_siwrts(struct net_device *d struct iw_request_info *info, struct iw_param *rts, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; u16 val; //check if the interface is down @@ -1571,19 +1571,19 @@ int rt_ioctl_giwrts(struct net_device *d if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; + pVirtualAd = dev->ml_priv; if (pVirtualAd && pVirtualAd->RtmpDev) - pAdapter = pVirtualAd->RtmpDev->priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -1605,7 +1605,7 @@ int rt_ioctl_siwfrag(struct net_device * struct iw_request_info *info, struct iw_param *frag, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; u16 val; //check if the interface is down @@ -1637,19 +1637,19 @@ int rt_ioctl_giwfrag(struct net_device * if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; + pVirtualAd = dev->ml_priv; if (pVirtualAd && pVirtualAd->RtmpDev) - pAdapter = pVirtualAd->RtmpDev->priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -1673,7 +1673,7 @@ int rt_ioctl_siwencode(struct net_device struct iw_request_info *info, struct iw_point *erq, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; //check if the interface is down if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) @@ -1780,19 +1780,19 @@ rt_ioctl_giwencode(struct net_device *de if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; + pVirtualAd = dev->ml_priv; if (pVirtualAd && pVirtualAd->RtmpDev) - pAdapter = pVirtualAd->RtmpDev->priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -1860,19 +1860,19 @@ rt_ioctl_setparam(struct net_device *dev if (dev->priv_flags == INT_MAIN) { - pAdapter = dev->priv; + pAdapter = dev->ml_priv; } else { - pVirtualAd = dev->priv; - pAdapter = pVirtualAd->RtmpDev->priv; + pVirtualAd = dev->ml_priv; + pAdapter = pVirtualAd->RtmpDev->ml_priv; } pObj = (POS_COOKIE) pAdapter->OS_Cookie; if (pAdapter == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -1928,7 +1928,7 @@ rt_private_get_statistics(struct net_dev struct iw_point *wrq, char *extra) { INT Status = 0; - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv; if (extra == NULL) { @@ -2055,18 +2055,18 @@ rt_private_show(struct net_device *dev, u32 subcmd = wrq->flags; if (dev->priv_flags == INT_MAIN) - pAd = dev->priv; + pAd = dev->ml_priv; else { - pVirtualAd = dev->priv; - pAd = pVirtualAd->RtmpDev->priv; + pVirtualAd = dev->ml_priv; + pAd = pVirtualAd->RtmpDev->ml_priv; } pObj = (POS_COOKIE) pAd->OS_Cookie; if (pAd == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } @@ -2213,7 +2213,7 @@ int rt_ioctl_siwmlme(struct net_device * union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv; struct iw_mlme *pMlme = (struct iw_mlme *)wrqu->data.pointer; MLME_QUEUE_ELEM MsgElem; MLME_DISASSOC_REQ_STRUCT DisAssocReq; @@ -2270,7 +2270,7 @@ int rt_ioctl_siwauth(struct net_device * struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; struct iw_param *param = &wrqu->param; //check if the interface is down @@ -2413,7 +2413,7 @@ int rt_ioctl_giwauth(struct net_device * struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; struct iw_param *param = &wrqu->param; //check if the interface is down @@ -2487,7 +2487,7 @@ int rt_ioctl_siwencodeext(struct net_dev union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; struct iw_point *encoding = &wrqu->encoding; struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; int keyIdx, alg = ext->alg; @@ -2596,7 +2596,7 @@ rt_ioctl_giwencodeext(struct net_device struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv; PCHAR pKey = NULL; struct iw_point *encoding = &wrqu->encoding; struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; @@ -2680,7 +2680,7 @@ int rt_ioctl_siwgenie(struct net_device struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv; if (wrqu->data.length > MAX_LEN_OF_RSNIE || (wrqu->data.length && extra == NULL)) @@ -2705,7 +2705,7 @@ int rt_ioctl_giwgenie(struct net_device struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv; if ((pAd->StaCfg.RSNIE_Len == 0) || (pAd->StaCfg.AuthMode < Ndis802_11AuthModeWPA)) @@ -2751,7 +2751,7 @@ int rt_ioctl_siwpmksa(struct net_device union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv; struct iw_pmksa *pPmksa = (struct iw_pmksa *)wrqu->data.pointer; INT CachedIdx = 0, idx = 0; @@ -2834,7 +2834,7 @@ rt_private_ioctl_bbp(struct net_device * UINT32 bbpValue; BOOLEAN bIsPrintAllBBP = FALSE; INT Status = 0; - PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv; memset(extra, 0x00, IW_PRIV_SIZE_MASK); @@ -2961,7 +2961,7 @@ int rt_ioctl_siwrate(struct net_device * struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv; UINT32 rate = wrqu->bitrate.value, fixed = wrqu->bitrate.fixed; //check if the interface is down @@ -3019,7 +3019,7 @@ int rt_ioctl_giwrate(struct net_device * struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv; + PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv; int rate_index = 0, rate_count = 0; HTTRANSMIT_SETTING ht_setting; __s32 ralinkrate[] = @@ -5409,19 +5409,19 @@ INT rt28xx_sta_ioctl( if (net_dev->priv_flags == INT_MAIN) { - pAd = net_dev->priv; + pAd = net_dev->ml_priv; } else { - pVirtualAd = net_dev->priv; - pAd = pVirtualAd->RtmpDev->priv; + pVirtualAd = net_dev->ml_priv; + pAd = pVirtualAd->RtmpDev->ml_priv; } pObj = (POS_COOKIE) pAd->OS_Cookie; if (pAd == NULL) { /* if 1st open fail, pAd will be free; - So the net_dev->priv will be NULL in 2rd open */ + So the net_dev->ml_priv will be NULL in 2rd open */ return -ENETDOWN; } Index: rt2860-kmod.spec =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/devel/rt2860-kmod.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- rt2860-kmod.spec 11 Jan 2009 10:41:12 -0000 1.22 +++ rt2860-kmod.spec 11 Jan 2009 15:28:40 -0000 1.23 @@ -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: rt2860-kmod Version: 1.8.0.0 -Release: 2%{?dist}.5 +Release: 3%{?dist} Summary: Kernel module for RaLink 802.11 wireless devices rt2760/rt2790/rt2860/rt2890 Group: System Environment/Kernel @@ -19,6 +19,7 @@ Patch1: rt2860-dat-install-fixes.patch Patch2: rt2860-add-network-mgr-support.diff Patch3: rt2860-remove-tftpboot-copy.patch +Patch5: rt2860-2.6.29-compile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_bindir}/kmodtool @@ -50,6 +51,11 @@ for kernel_version in %{?kernel_versions} ; do cp -a *RT2860_Linux_STA* _kmod_build_${kernel_version%%___*} + pushd _kmod_build_${kernel_version%%___*} + if [[ $kernel_version > "2.6.29" ]]; then +%patch5 -p2 -b .2.6.29 + fi + popd done %build @@ -70,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jan 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.8.0.0-3 +- Add a patch for compilation against kernels >= 2.6.29 + * Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.8.0.0-2.5 - rebuild for latest Fedora kernel;

15 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits January 2009