rpms/rt2870-kmod/F-13 rt2870-2.6.34.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 rt2870-Makefile.x-fixes.patch, 1.2, 1.3 rt2870-NetworkManager-support.patch, 1.2, 1.3 rt2870-additional-devices-support.patch, 1.6, 1.7 rt2870-kmod.spec, 1.65, 1.66 rt2870-no2.4-in-kernelversion.patch, 1.1, 1.2 rt2870-suppress-flood.patch, 1.1, 1.2 sources, 1.5, 1.6 rt2870-2.6.31-compile.patch, 1.1, NONE rt2870-strip-tftpboot-copy.patch, 1.3, NONE
7:16 p.m.
Author: oget
Update of /cvs/free/rpms/rt2870-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1131
Modified Files:
.cvsignore rt2870-Makefile.x-fixes.patch
rt2870-NetworkManager-support.patch
rt2870-additional-devices-support.patch rt2870-kmod.spec
rt2870-no2.4-in-kernelversion.patch
rt2870-suppress-flood.patch sources
Added Files:
rt2870-2.6.34.patch
Removed Files:
rt2870-2.6.31-compile.patch rt2870-strip-tftpboot-copy.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: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-13/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 22 May 2009 20:43:48 -0000 1.5
+++ .cvsignore 4 Jul 2010 19:16:46 -0000 1.6
@@ -1 +1 @@
-2009_0521_RT2870_Linux_STA_V2.1.2.0.tgz
+2010_06_25_RT2870_Linux_STA_v2.4.0.0.tgz
rt2870-Makefile.x-fixes.patch:
Makefile.4 | 9 ++-------
Makefile.6 | 9 ++-------
2 files changed, 4 insertions(+), 14 deletions(-)
Index: rt2870-Makefile.x-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-13/rt2870-Makefile.x-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rt2870-Makefile.x-fixes.patch 26 Mar 2009 05:18:48 -0000 1.2
+++ rt2870-Makefile.x-fixes.patch 4 Jul 2010 19:16:46 -0000 1.3
@@ -1,7 +1,7 @@
-diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.4
2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.4
---- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.4 2009-03-01
21:54:15.000000000 -0500
-+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.4 2009-03-25 20:37:41.000000000
-0400
-@@ -94,13 +94,15 @@ clean:
+diff -rupN 2010_06_25_RT2870_Linux_STA_v2.4.0.0.old/os/linux/Makefile.4
2010_06_25_RT2870_Linux_STA_v2.4.0.0/os/linux/Makefile.4
+--- 2010_06_25_RT2870_Linux_STA_v2.4.0.0.old/os/linux/Makefile.4 2010-06-01
01:58:47.000000000 -0400
++++ 2010_06_25_RT2870_Linux_STA_v2.4.0.0/os/linux/Makefile.4 2010-06-26
19:01:28.000000000 -0400
+@@ -123,13 +123,8 @@ clean:
rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d}
install:
@@ -12,22 +12,15 @@
- install -d $(LINUX_SRC_MODULE)
- install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(LINUX_SRC_MODULE)
- /sbin/depmod -a ${shell uname -r}
-+# rm -rf $(DAT_PATH)
-+# $(shell [ ! -f /etc/Wireless ] && mkdir /etc/Wireless)
-+# mkdir $(DAT_PATH)
-+# cp $(RT28xx_DIR)/$(DAT_FILE_NAME) $(DAT_PATH)/.
-+# install -d $(LINUX_SRC_MODULE)
-+# install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(LINUX_SRC_MODULE)
-+# /sbin/depmod -a ${shell uname -r}
+ mkdir -p $(INST_DIR)
+ install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(INST_DIR)
uninstall:
# rm -rf $(DAT_PATH)
-diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.6
2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.6
---- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.6 2009-03-01
21:54:24.000000000 -0500
-+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.6 2009-03-25 20:38:49.000000000
-0400
-@@ -89,13 +89,15 @@ clean:
+diff -rupN 2010_06_25_RT2870_Linux_STA_v2.4.0.0.old/os/linux/Makefile.6
2010_06_25_RT2870_Linux_STA_v2.4.0.0/os/linux/Makefile.6
+--- 2010_06_25_RT2870_Linux_STA_v2.4.0.0.old/os/linux/Makefile.6 2010-06-01
01:58:27.000000000 -0400
++++ 2010_06_25_RT2870_Linux_STA_v2.4.0.0/os/linux/Makefile.6 2010-06-26
19:00:11.000000000 -0400
+@@ -137,13 +137,8 @@ clean:
rm -f ../../sta/.*.{cmd,flags,d}
install:
@@ -38,13 +31,6 @@
- install -d $(LINUX_SRC_MODULE)
- install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE)
- /sbin/depmod -a ${shell uname -r}
-+# rm -rf $(DAT_PATH)
-+# $(shell [ ! -f /etc/Wireless ] && mkdir /etc/Wireless)
-+# mkdir $(DAT_PATH)
-+# cp $(RT28xx_DIR)/$(DAT_FILE_NAME) $(DAT_PATH)/.
-+# install -d $(LINUX_SRC_MODULE)
-+# install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE)
-+# /sbin/depmod -a ${shell uname -r}
+ mkdir -p $(INST_DIR)
+ install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(INST_DIR)
rt2870-NetworkManager-support.patch:
config.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: rt2870-NetworkManager-support.patch
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-13/rt2870-NetworkManager-support.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rt2870-NetworkManager-support.patch 26 Mar 2009 05:18:48 -0000 1.2
+++ rt2870-NetworkManager-support.patch 4 Jul 2010 19:16:46 -0000 1.3
@@ -1,17 +1,16 @@
---- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk 2009-03-10
00:47:50.000000000 -0400
-+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk 2009-03-25 20:40:49.000000000
-0400
-@@ -6,12 +6,12 @@ HAS_28xx_QA=n
+diff -rupN DPO_RT2870_LinuxSTA_V2.3.0.0.old/os/linux/config.mk
DPO_RT2870_LinuxSTA_V2.3.0.0/os/linux/config.mk
+--- DPO_RT2870_LinuxSTA_V2.3.0.0.old/os/linux/config.mk 2009-12-09 01:15:38.000000000
-0500
++++ DPO_RT2870_LinuxSTA_V2.3.0.0/os/linux/config.mk 2009-12-09 01:17:53.000000000 -0500
+@@ -8,10 +8,10 @@ HAS_QA_SUPPORT=n
+ HAS_XLINK=n
- #ifdef WPA_SUPPLICANT_SUPPORT
# Support Wpa_Supplicant
-HAS_WPA_SUPPLICANT=n
+HAS_WPA_SUPPLICANT=y
- #endif // WPA_SUPPLICANT_SUPPORT //
- #ifdef NATIVE_WPA_SUPPLICANT_SUPPORT
# Support Native WpaSupplicant for Network Maganger
-HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n
+HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y
- #endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
#Support Net interface block while Tx-Sw queue full
+ HAS_BLOCK_NET_IF=n
rt2870-additional-devices-support.patch:
rtusb_dev_id.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
Index: rt2870-additional-devices-support.patch
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-13/rt2870-additional-devices-support.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rt2870-additional-devices-support.patch 28 Nov 2009 08:39:43 -0000 1.6
+++ rt2870-additional-devices-support.patch 4 Jul 2010 19:16:46 -0000 1.7
@@ -1,77 +1,74 @@
-diff -rupN 2009_0521_RT2870_Linux_STA_V2.1.2.0.old/os/linux/usb_main_dev.c
2009_0521_RT2870_Linux_STA_V2.1.2.0/os/linux/usb_main_dev.c
---- 2009_0521_RT2870_Linux_STA_V2.1.2.0.old/os/linux/usb_main_dev.c 2009-04-23
05:40:40.000000000 -0400
-+++ 2009_0521_RT2870_Linux_STA_V2.1.2.0/os/linux/usb_main_dev.c 2009-11-28
03:22:23.000000000 -0500
-@@ -105,6 +105,73 @@ struct usb_device_id rtusb_usb_id[] = {
- {USB_DEVICE(0x1737,0x0071)}, /* Linksys WUSB600N */
- {USB_DEVICE(0x0411,0x00e8)}, /* Buffalo WLI-UC-G300N*/
+diff -rupN DPO_RT2870_LinuxSTA_V2.3.0.0.old/common/rtusb_dev_id.c
DPO_RT2870_LinuxSTA_V2.3.0.0/common/rtusb_dev_id.c
+--- DPO_RT2870_LinuxSTA_V2.3.0.0.old/common/rtusb_dev_id.c 2009-11-26 01:22:40.000000000
-0500
++++ DPO_RT2870_LinuxSTA_V2.3.0.0/common/rtusb_dev_id.c 2009-12-09 01:09:13.000000000
-0500
+@@ -105,6 +105,70 @@ USB_DEVICE_ID rtusb_dev_id[] = {
{USB_DEVICE(0x050d,0x815c)}, /* Belkin F5D8053 */
+ {USB_DEVICE(0x100D,0x9031)}, /* Motorola 2770 */
+ {USB_DEVICE(0x0DB0,0x6899)},
+ /* The following were taken from drivers/net/wireless/rt2x00/rt2800usb.c
-+ of SerialMonkey's kernel branch, which will be a part of mainstream kernel
-+ soon. We will get rid of this kmod then. - Orcan Ogetbil */
-+ /* Amigo */
-+ { USB_DEVICE(0x0e0b, 0x9031) },
-+ { USB_DEVICE(0x0e0b, 0x9041) },
-+ /* ASUS */
-+ { USB_DEVICE(0x0b05, 0x1760) },
-+ { USB_DEVICE(0x0b05, 0x1761) },
-+ /* AzureWave */
-+ { USB_DEVICE(0x13d3, 0x3262) },
-+ { USB_DEVICE(0x13d3, 0x3284) },
-+ /* Belkin */
-+ { USB_DEVICE(0x050d, 0x825a) },
-+ /* Buffalo */
-+ { USB_DEVICE(0x0411, 0x012e) },
-+ /* Conceptronic */
-+ { USB_DEVICE(0x14b2, 0x3c08) },
-+ { USB_DEVICE(0x14b2, 0x3c11) },
-+ /* Corega */
-+ { USB_DEVICE(0x18c5, 0x0008) },
-+ /* D-Link */
-+ { USB_DEVICE(0x07d1, 0x3c0b) },
-+ { USB_DEVICE(0x07d1, 0x3c13) },
-+ /* EnGenius */
-+ { USB_DEVICE(0x1740, 0x9801) },
-+ /* Gemtek */
-+ { USB_DEVICE(0x15a9, 0x0010) },
-+ /* Gigabyte */
-+ { USB_DEVICE(0x1044, 0x800c) },
-+ /* Hawking */
-+ { USB_DEVICE(0x0e66, 0x0009) },
-+ { USB_DEVICE(0x0e66, 0x000b) },
-+ { USB_DEVICE(0x0e66, 0x0015)}, /* Hawking HWDN2 REV-E*/
-+ /* LevelOne */
-+ { USB_DEVICE(0x1740, 0x0605) },
-+ { USB_DEVICE(0x1740, 0x0615) },
-+ /* Linksys */
-+ { USB_DEVICE(0x1737, 0x0077) },
-+ /* Motorola */
-+ { USB_DEVICE(0x100d, 0x9031) },
-+ { USB_DEVICE(0x100d, 0x9032) },
-+ /* Ovislink */
-+ { USB_DEVICE(0x1b75, 0x3072) },
-+ /* Pegatron */
-+ { USB_DEVICE(0x1d4d, 0x0002) },
-+ /* Planex */
-+ { USB_DEVICE(0x2019, 0xab24) },
-+ /* Qcom */
-+ { USB_DEVICE(0x18e8, 0x6259) },
-+ /* Ralink */
-+ { USB_DEVICE(0x0db0, 0x6899) },
-+ { USB_DEVICE(0x148f, 0x2070) },
-+ /* Sitecom */
-+ { USB_DEVICE(0x0df6, 0x003b) },
-+ { USB_DEVICE(0x0df6, 0x003c) },
-+ { USB_DEVICE(0x0df6, 0x003d) },
-+ { USB_DEVICE(0x0df6, 0x003f) },
-+ { USB_DEVICE(0x0df6, 0x0040) },
-+ /* SMC */
-+ { USB_DEVICE(0x083a, 0xa512) },
-+ { USB_DEVICE(0x083a, 0xc522) },
-+ /* Sweex */
-+ { USB_DEVICE(0x177f, 0x0153) },
-+ { USB_DEVICE(0x177f, 0x0313) },
-+ /* Zyxel */
-+ { USB_DEVICE(0x0586, 0x341a) },
++ of SerialMonkey's kernel branch, which will be a part of mainstream
kernel
++ soon. We will get rid of this kmod then. - Orcan Ogetbil */
++ /* Amigo */
++ { USB_DEVICE(0x0e0b, 0x9031) },
++ { USB_DEVICE(0x0e0b, 0x9041) },
++ /* ASUS */
++ { USB_DEVICE(0x0b05, 0x1760) },
++ { USB_DEVICE(0x0b05, 0x1761) },
++ /* AzureWave */
++ { USB_DEVICE(0x13d3, 0x3262) },
++ { USB_DEVICE(0x13d3, 0x3284) },
++ /* Belkin */
++ { USB_DEVICE(0x050d, 0x825a) },
++ /* Buffalo */
++ { USB_DEVICE(0x0411, 0x012e) },
++ /* Conceptronic */
++ { USB_DEVICE(0x14b2, 0x3c08) },
++ { USB_DEVICE(0x14b2, 0x3c11) },
++ /* Corega */
++ { USB_DEVICE(0x18c5, 0x0008) },
++ /* D-Link */
++ { USB_DEVICE(0x07d1, 0x3c0b) },
++ { USB_DEVICE(0x07d1, 0x3c13) },
++ /* EnGenius */
++ { USB_DEVICE(0x1740, 0x9801) },
++ /* Gemtek */
++ { USB_DEVICE(0x15a9, 0x0010) },
++ /* Gigabyte */
++ { USB_DEVICE(0x1044, 0x800c) },
++ /* Hawking */
++ { USB_DEVICE(0x0e66, 0x0009) },
++ { USB_DEVICE(0x0e66, 0x000b) },
++ { USB_DEVICE(0x0e66, 0x0015)}, /* Hawking HWDN2 REV-E*/
++ /* LevelOne */
++ { USB_DEVICE(0x1740, 0x0605) },
++ { USB_DEVICE(0x1740, 0x0615) },
++ /* Linksys */
++ { USB_DEVICE(0x1737, 0x0077) },
++ /* Motorola */
++ { USB_DEVICE(0x100d, 0x9032) },
++ /* Ovislink */
++ { USB_DEVICE(0x1b75, 0x3072) },
++ /* Pegatron */
++ { USB_DEVICE(0x1d4d, 0x0002) },
++ /* Planex */
++ { USB_DEVICE(0x2019, 0xab24) },
++ /* Qcom */
++ { USB_DEVICE(0x18e8, 0x6259) },
++ /* Ralink */
++ { USB_DEVICE(0x148f, 0x2070) },
++ /* Sitecom */
++ { USB_DEVICE(0x0df6, 0x003b) },
++ { USB_DEVICE(0x0df6, 0x003c) },
++ { USB_DEVICE(0x0df6, 0x003d) },
++ { USB_DEVICE(0x0df6, 0x0040) },
++ /* SMC */
++ { USB_DEVICE(0x083a, 0xa512) },
++ { USB_DEVICE(0x083a, 0xc522) },
++ /* Sweex */
++ { USB_DEVICE(0x177f, 0x0153) },
++ { USB_DEVICE(0x177f, 0x0313) },
++ /* Zyxel */
++ { USB_DEVICE(0x0586, 0x341a) },
#endif // RT2870 //
{ }/* Terminating entry */
};
Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-13/rt2870-kmod.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- rt2870-kmod.spec 18 Jun 2010 12:54:43 -0000 1.65
+++ rt2870-kmod.spec 4 Jul 2010 19:16:46 -0000 1.66
@@ -3,24 +3,24 @@
# "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: rt2870-kmod
-Version: 2.1.2.0
-Release: 6%{?dist}.8
+Version: 2.4.0.0
+Release: 2%{?dist}
Summary: Kernel module for wireless devices with Ralink's rt2870 chipsets
Group: System Environment/Kernel
License: GPLv2+
-URL: http://www.ralinktech.com/ralink/Home/Support/Linux.html
-Source0: http://www.ralinktech.com.tw/data/drivers/2009_0521_RT2870_Linux_STA_V%{v...
+URL: http://www.ralinktech.com/support.php?s=2
+# No direct links anymore. The sources are downloaded from the above page.
+Source0: 2010_06_25_RT2870_Linux_STA_v2.4.0.0.tgz
Source11: rt2870-kmodtool-excludekernel-filterfile
Patch0: rt2870-additional-devices-support.patch
Patch1: rt2870-no2.4-in-kernelversion.patch
Patch2: rt2870-Makefile.x-fixes.patch
Patch3: rt2870-NetworkManager-support.patch
-Patch4: rt2870-strip-tftpboot-copy.patch
-Patch5: rt2870-2.6.31-compile.patch
+Patch4: rt2870-2.6.34.patch
Patch6: rt2870-suppress-flood.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,14 +48,13 @@
%patch1 -p1 -b .no24
%patch2 -p1 -b .rpmbuild
%patch3 -p1 -b .NetworkManager
-%patch4 -p1 -b .tftpboot
-%patch5 -p1 -b .2.6.31
+%patch4 -p1 -b .2.6.34
%patch6 -p1 -b .messageflood
popd
# Fix permissions
for ext in c h; do
- find . -name "*.$ext" -exec chmod -x '{}' \;
+ find . -name "*.$ext" -exec chmod -x '{}' \;
done
for kernel_version in %{?kernel_versions} ; do
@@ -80,6 +79,12 @@
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
+
* Fri Jun 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.1.2.0-6.8
- rebuild for new kernel
rt2870-no2.4-in-kernelversion.patch:
Makefile | 20 --------------------
os/linux/config.mk | 27 ---------------------------
2 files changed, 47 deletions(-)
Index: rt2870-no2.4-in-kernelversion.patch
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-13/rt2870-no2.4-in-kernelversion.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rt2870-no2.4-in-kernelversion.patch 26 Mar 2009 06:50:08 -0000 1.1
+++ rt2870-no2.4-in-kernelversion.patch 4 Jul 2010 19:16:46 -0000 1.2
@@ -1,23 +1,127 @@
-diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk
2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk
---- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk 2009-03-10
00:47:50.000000000 -0400
-+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk 2009-03-26 01:57:12.000000000
-0400
-@@ -236,14 +236,14 @@ export CFLAGS
+diff -rupN 2010_06_25_RT2870_Linux_STA_v2.4.0.0.old/Makefile
2010_06_25_RT2870_Linux_STA_v2.4.0.0/Makefile
+--- 2010_06_25_RT2870_Linux_STA_v2.4.0.0.old/Makefile 2010-06-01 01:25:21.000000000
-0400
++++ 2010_06_25_RT2870_Linux_STA_v2.4.0.0/Makefile 2010-06-26 18:55:14.000000000 -0400
+@@ -233,13 +233,6 @@ test:
+ $(MAKE) -C tools test
+
+ LINUX:
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+-
+- cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile
+- $(MAKE) -C $(RT28xx_DIR)/os/linux/
+-
+- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
+-else
+ cp -f os/linux/Makefile.6 $(RT28xx_DIR)/os/linux/Makefile
+ ifeq ($(PLATFORM),DM6446)
+ $(MAKE) ARCH=arm CROSS_COMPILE=arm_v5t_le- -C $(LINUX_SRC)
SUBDIRS=$(RT28xx_DIR)/os/linux modules
+@@ -251,33 +244,20 @@ else
+ endif
+ endif
+
+-endif
+
+ clean:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- cp -f os/linux/Makefile.4 os/linux/Makefile
+-else
+ cp -f os/linux/Makefile.6 os/linux/Makefile
+-endif
+ $(MAKE) -C os/linux clean
+ rm -rf os/linux/Makefile
+ endif
+
+ uninstall:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- $(MAKE) -C $(RT28xx_DIR)/os/linux -f Makefile.4 uninstall
+-else
+ $(MAKE) -C $(RT28xx_DIR)/os/linux -f Makefile.6 uninstall
+ endif
+-endif
+
+ install:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- $(MAKE) -C $(RT28xx_DIR)/os/linux -f Makefile.4 install
+-else
+ $(MAKE) -C $(RT28xx_DIR)/os/linux -f Makefile.6 install
+ endif
+-endif
+diff -rupN 2010_06_25_RT2870_Linux_STA_v2.4.0.0.old/os/linux/config.mk
2010_06_25_RT2870_Linux_STA_v2.4.0.0/os/linux/config.mk
+--- 2010_06_25_RT2870_Linux_STA_v2.4.0.0.old/os/linux/config.mk 2010-06-17
04:16:15.000000000 -0400
++++ 2010_06_25_RT2870_Linux_STA_v2.4.0.0/os/linux/config.mk 2010-06-26 18:56:42.000000000
-0400
+@@ -256,14 +256,9 @@ WFLAGS += -DRT_BIG_ENDIAN -DINF_TWINPASS
+ endif
+
+ ifeq ($(PLATFORM),INF_DANUBE)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+-# Linux 2.4
+-WFLAGS += -DINF_DANUBE -DRT_BIG_ENDIAN
+-else
+ # Linux 2.6
+ WFLAGS += -DRT_BIG_ENDIAN
+ endif
+-endif
+
+ ifeq ($(PLATFORM),INF_AR9)
+ WFLAGS += -DRT_BIG_ENDIAN -DINF_AR9
+@@ -355,11 +350,7 @@ export CFLAGS
+ endif
+
+ ifeq ($(PLATFORM),INF_DANUBE)
+- ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- CFLAGS := -I$(RT28xx_DIR)/include $(WFLAGS) -Wundef -fno-strict-aliasing -fno-common
-ffreestanding -Os -fomit-frame-pointer -G 0 -mno-abicalls -fno-pic -pipe -msoft-float
-mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap
-I$(LINUX_SRC)/include/asm-mips/mach-generic
+- else
+ CFLAGS := -I$(RT28xx_DIR)/include $(WFLAGS) -Wundef -fno-strict-aliasing -fno-common
-ffreestanding -Os -fomit-frame-pointer -G 0 -mno-abicalls -fno-pic -pipe -msoft-float
-mabi=32 -march=mips32r2 -Wa,-32 -Wa,-march=mips32r2 -Wa,-mips32r2 -Wa,--trap
-I$(LINUX_SRC)/include/asm-mips/mach-generic
+- endif
+ export CFLAGS
+ endif
+
+@@ -389,14 +380,8 @@ export CFLAGS
endif
ifeq ($(PLATFORM),PC)
- ifneq (,$(findstring 2.4,$(LINUX_SRC)))
-+ # ifneq (,$(findstring 2.4,$(LINUX_SRC)))
- # Linux 2.4
+- # Linux 2.4
- CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -I$(RT28xx_DIR)/include -O2
-fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2
-march=i686 -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h
$(WFLAGS)
- export CFLAGS
- else
-+ # CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -I$(RT28xx_DIR)/include -O2
-fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2
-march=i686 -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h
$(WFLAGS)
-+ # export CFLAGS
-+ # else
# Linux 2.6
EXTRA_CFLAGS := $(WFLAGS) -I$(RT28xx_DIR)/include
- endif
-+ # endif
endif
- ifeq ($(PLATFORM),IXP)
+ #If the kernel version of RMI is newer than 2.6.27, please change "CFLAGS" to
"EXTRA_FLAGS"
+@@ -447,11 +432,6 @@ export CFLAGS
+ endif
+
+ ifeq ($(PLATFORM),MT85XX)
+- ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- # Linux 2.4
+- CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -I$(RT28xx_DIR)/include -O2
-fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2
-march=i686 -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h
$(WFLAGS)
+- export CFLAGS
+- else
+ # Linux 2.6
+ EXTRA_CFLAGS += $(WFLAGS) -I$(RT28xx_DIR)/include
+ EXTRA_CFLAGS += -D _NO_TYPEDEF_BOOL_ \
+@@ -464,18 +444,11 @@ ifeq ($(PLATFORM),MT85XX)
+ -D _NO_TYPEDEF_INT32_ \
+ -D _NO_TYPEDEF_INT64_ \
+
+- endif
+ endif
+
+ ifeq ($(PLATFORM),NXP_TV550)
+- ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- # Linux 2.4
+- CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -I$(RT28xx_DIR)/include -O2
-fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2
-march=mips -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h
$(WFLAGS)
+- export CFLAGS
+- else
+ # Linux 2.6
+ EXTRA_CFLAGS := $(WFLAGS) -I$(RT28xx_DIR)/include
+- endif
+ endif
+
+ ifeq ($(PLATFORM),MVL5)
rt2870-suppress-flood.patch:
common/cmm_asic.c | 4 ++--
common/rt_ate.c | 4 ++--
os/linux/sta_ioctl.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
Index: rt2870-suppress-flood.patch
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-13/rt2870-suppress-flood.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rt2870-suppress-flood.patch 22 Aug 2009 18:27:45 -0000 1.1
+++ rt2870-suppress-flood.patch 4 Jul 2010 19:16:46 -0000 1.2
@@ -1,16 +1,16 @@
-diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/common/cmm_asic.c
2009_0521_RT2860_Linux_STA_V2.1.2.0/common/cmm_asic.c
---- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/common/cmm_asic.c 2009-03-25
03:20:30.000000000 -0400
-+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/common/cmm_asic.c 2009-08-22 12:24:53.000000000
-0400
-@@ -609,7 +609,7 @@ VOID AsicSwitchChannel(
- TxPwer = (7+TxPwer);
- TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer);
+diff -rupN 2010_06_25_RT2870_Linux_STA_v2.4.0.0.old/common/cmm_asic.c
2010_06_25_RT2870_Linux_STA_v2.4.0.0/common/cmm_asic.c
+--- 2010_06_25_RT2870_Linux_STA_v2.4.0.0.old/common/cmm_asic.c 2010-05-31
22:28:56.000000000 -0400
++++ 2010_06_25_RT2870_Linux_STA_v2.4.0.0/common/cmm_asic.c 2010-06-26 19:10:40.000000000
-0400
+@@ -996,7 +996,7 @@ VOID AsicSwitchChannel(
+ // TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer);
+
R3 |= (TxPwer << 10);
- DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer=%d \n",
TxPwer));
+ // comment out as it causes flood // DBGPRINT(RT_DEBUG_ERROR,
("AsicSwitchChannel: TxPwer=%d \n", TxPwer));
}
else
{
-@@ -623,7 +623,7 @@ VOID AsicSwitchChannel(
+@@ -1010,7 +1010,7 @@ VOID AsicSwitchChannel(
TxPwer2 = (7+TxPwer2);
TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2);
R4 |= (TxPwer2 << 7);
@@ -19,36 +19,36 @@
}
else
{
-diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/rt_ate.c
2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/rt_ate.c
---- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/rt_ate.c 2009-03-25
04:06:34.000000000 -0400
-+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/rt_ate.c 2009-08-22 12:25:24.000000000
-0400
-@@ -4031,7 +4031,7 @@ VOID ATEAsicSwitchChannel(
+diff -rupN 2010_06_25_RT2870_Linux_STA_v2.4.0.0.old/common/rt_ate.c
2010_06_25_RT2870_Linux_STA_v2.4.0.0/common/rt_ate.c
+--- 2010_06_25_RT2870_Linux_STA_v2.4.0.0.old/common/rt_ate.c 2010-06-17
02:53:00.000000000 -0400
++++ 2010_06_25_RT2870_Linux_STA_v2.4.0.0/common/rt_ate.c 2010-06-26 19:12:53.000000000
-0400
+@@ -4553,7 +4553,7 @@ VOID ATEAsicSwitchChannel(
TxPwer = (7+TxPwer);
TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer);
R3 |= (TxPwer << 10);
-- ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer=%d \n",
TxPwer));
-+ // comment out as it causes flood // ATEDBGPRINT(RT_DEBUG_TRACE,
("ATEAsicSwitchChannel: TxPwer=%d \n", TxPwer));
+- DBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer=%d \n",
TxPwer));
++ // comment out as it causes flood // DBGPRINT(RT_DEBUG_TRACE,
("ATEAsicSwitchChannel: TxPwer=%d \n", TxPwer));
}
else
{
-@@ -4045,7 +4045,7 @@ VOID ATEAsicSwitchChannel(
+@@ -4567,7 +4567,7 @@ VOID ATEAsicSwitchChannel(
TxPwer2 = (7+TxPwer2);
TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2);
R4 |= (TxPwer2 << 7);
-- ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer2=%d \n",
TxPwer2));
-+ // comment out as it causes flood // ATEDBGPRINT(RT_DEBUG_TRACE,
("ATEAsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
+- DBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer2=%d \n",
TxPwer2));
++ // comment out as it causes flood // DBGPRINT(RT_DEBUG_TRACE,
("ATEAsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
}
else
{
-diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/sta_ioctl.c
2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/sta_ioctl.c
---- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/sta_ioctl.c 2009-04-23
06:07:18.000000000 -0400
-+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/sta_ioctl.c 2009-08-22
12:22:44.000000000 -0400
-@@ -1465,7 +1465,7 @@ int rt_ioctl_giwscan(struct net_device *
+diff -rupN 2010_06_25_RT2870_Linux_STA_v2.4.0.0.old/os/linux/sta_ioctl.c
2010_06_25_RT2870_Linux_STA_v2.4.0.0/os/linux/sta_ioctl.c
+--- 2010_06_25_RT2870_Linux_STA_v2.4.0.0.old/os/linux/sta_ioctl.c 2010-06-18
06:10:02.000000000 -0400
++++ 2010_06_25_RT2870_Linux_STA_v2.4.0.0/os/linux/sta_ioctl.c 2010-06-26
19:14:57.000000000 -0400
+@@ -1102,7 +1102,7 @@ int rt_ioctl_giwscan(struct net_device *
data->length = current_ev - extra;
- pAdapter->StaCfg.bScanReqIsFromWebUI = FALSE;
-- DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned,
data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length));
-+ // comment out as it causes flood in system messages. // DBGPRINT(RT_DEBUG_ERROR
,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i ,
pAdapter->ScanTab.BssNr, data->length));
+ pAd->StaCfg.bScanReqIsFromWebUI = FALSE;
+- DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned,
data->length = %d\n",i , pAd->ScanTab.BssNr, data->length));
++ // comment out as it causes flood in system messages. // DBGPRINT(RT_DEBUG_ERROR
,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i ,
pAd->ScanTab.BssNr, data->length));
return 0;
}
#endif
Index: sources
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-13/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 22 May 2009 20:43:48 -0000 1.5
+++ sources 4 Jul 2010 19:16:46 -0000 1.6
@@ -1 +1 @@
-31ded4a23d5c5546fff596eca5585070 2009_0521_RT2870_Linux_STA_V2.1.2.0.tgz
+9ab5d68566eb6defd5a794bb98bcf425 2010_06_25_RT2870_Linux_STA_v2.4.0.0.tgz
--- rt2870-2.6.31-compile.patch DELETED ---
--- rt2870-strip-tftpboot-copy.patch DELETED ---
5291
days inactive
5291
days old
rpmfusion-commits@lists.rpmfusion.org
0 comments
1 participants
participants (1)
-
Orcan Ogetbil