Author: oget Update of /cvs/free/rpms/rt2870-kmod/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv32681 Modified Files: rt2870-kmod.spec Added Files: rt2870-2.6.34.patch Log Message: * Sun Jul 04 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.0.0-2 - Compilation fix against kernel >= 2.6.34 rt2870-2.6.34.patch: rt_linux.h | 5 +++++ 1 file changed, 5 insertions(+) --- NEW FILE rt2870-2.6.34.patch --- diff -rupN 2010_06_25_RT2870_Linux_STA_v2.4.0.0.old/include/os/rt_linux.h 2010_06_25_RT2870_Linux_STA_v2.4.0.0/include/os/rt_linux.h --- 2010_06_25_RT2870_Linux_STA_v2.4.0.0.old/include/os/rt_linux.h 2010-06-08 23:23:11.000000000 -0400 +++ 2010_06_25_RT2870_Linux_STA_v2.4.0.0/include/os/rt_linux.h 2010-07-04 14:57:19.000000000 -0400 @@ -1074,8 +1074,13 @@ typedef struct usb_device_id USB_DEVICE_ #define RT28XX_PUT_DEVICE usb_put_dev #define RTUSB_ALLOC_URB(iso) usb_alloc_urb(iso, GFP_ATOMIC) #define RTUSB_SUBMIT_URB(pUrb) usb_submit_urb(pUrb, GFP_ATOMIC) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34) +#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr) usb_alloc_coherent(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr) +#define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) usb_free_coherent(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) +#else #define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr) usb_buffer_alloc(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr) #define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) usb_buffer_free(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) +#endif #else #define RT28XX_PUT_DEVICE rausb_put_dev Index: rt2870-kmod.spec =================================================================== RCS file: /cvs/free/rpms/rt2870-kmod/devel/rt2870-kmod.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- rt2870-kmod.spec 4 Jul 2010 18:26:50 -0000 1.58 +++ rt2870-kmod.spec 4 Jul 2010 19:04:03 -0000 1.59 @@ -7,7 +7,7 @@ Name: rt2870-kmod Version: 2.4.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kernel module for wireless devices with Ralink's rt2870 chipsets Group: System Environment/Kernel @@ -20,6 +20,7 @@ Patch1: rt2870-no2.4-in-kernelversion.patch Patch2: rt2870-Makefile.x-fixes.patch Patch3: rt2870-NetworkManager-support.patch +Patch4: rt2870-2.6.34.patch Patch6: rt2870-suppress-flood.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,6 +48,7 @@ %patch1 -p1 -b .no24 %patch2 -p1 -b .rpmbuild %patch3 -p1 -b .NetworkManager +%patch4 -p1 -b .2.6.34 %patch6 -p1 -b .messageflood popd @@ -77,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jul 04 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.0.0-2 +- Compilation fix against kernel >= 2.6.34 + * Sat Jun 26 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.0.0-1 - Update to 2.4.0.0