Author: oget Update of /cvs/free/rpms/rt2860-kmod/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv27268 Modified Files: .cvsignore rt2860-dat-install-fixes.patch rt2860-kmod.spec rt2860-no2.4-in-kernelversion.patch rt2860-suppress-flood.patch sources Log Message: * Wed Sep 22 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.0.0-1 - version update (2.4.0.0) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/F-12/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 7 May 2010 07:17:01 -0000 1.7 +++ .cvsignore 22 Sep 2010 05:03:55 -0000 1.8 @@ -1 +1 @@ -2010_01_29_RT2860_Linux_STA_v2.3.0.0.tar.bz2 +2010_07_16_RT2860_Linux_STA_v2.4.0.0.tar.gz rt2860-dat-install-fixes.patch: Makefile.6 | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) Index: rt2860-dat-install-fixes.patch =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/F-12/rt2860-dat-install-fixes.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rt2860-dat-install-fixes.patch 7 May 2010 07:17:02 -0000 1.4 +++ rt2860-dat-install-fixes.patch 22 Sep 2010 05:03:55 -0000 1.5 @@ -1,7 +1,7 @@ -diff -rupN 2009_0918_RT2860_Linux_STA_v2.2.0.0.old/os/linux/Makefile.6 2009_0918_RT2860_Linux_STA_v2.2.0.0/os/linux/Makefile.6 ---- 2009_0918_RT2860_Linux_STA_v2.2.0.0.old/os/linux/Makefile.6 2009-09-13 23:50:36.000000000 -0400 -+++ 2009_0918_RT2860_Linux_STA_v2.2.0.0/os/linux/Makefile.6 2009-10-24 00:34:24.000000000 -0400 -@@ -105,15 +105,8 @@ clean: +diff -rupN 2010_07_16_RT2860_Linux_STA_v2.4.0.0.old/os/linux/Makefile.6 2010_07_16_RT2860_Linux_STA_v2.4.0.0/os/linux/Makefile.6 +--- 2010_07_16_RT2860_Linux_STA_v2.4.0.0.old/os/linux/Makefile.6 2010-07-08 07:52:12.000000000 -0400 ++++ 2010_07_16_RT2860_Linux_STA_v2.4.0.0/os/linux/Makefile.6 2010-08-29 16:26:26.000000000 -0400 +@@ -131,18 +131,11 @@ clean: rm -f ../../sta/.*.{cmd,flags,d} install: @@ -20,3 +20,6 @@ - rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .ko,$(MOD_NAME))) - /sbin/depmod -a ${shell uname -r} + rm -rf $(addprefix $(INST_DIR),$(addsuffix .ko,$(MOD_NAME))) + + # Declare the contents of the .PHONY variable as phony. We keep that + # information in a variable so we can use it in if_changed and friends. Index: rt2860-kmod.spec =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/F-12/rt2860-kmod.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- rt2860-kmod.spec 19 Sep 2010 14:17:29 -0000 1.82 +++ rt2860-kmod.spec 22 Sep 2010 05:03:55 -0000 1.83 @@ -3,18 +3,18 @@ # "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: 2.3.0.0 -Release: 1%{?dist}.6 +Version: 2.4.0.0 +Release: 1%{?dist} Summary: Kernel module for RaLink 802.11 wireless devices rt2760/rt2790/rt2860/rt2890 Group: System Environment/Kernel License: GPLv2+ URL: http://www.ralinktech.com/support.php?s=2 # No direct downloads anymore. See the above link. -Source0: 2010_01_29_RT2860_Linux_STA_v2.3.0.0.tar.bz2 +Source0: 2010_07_16_RT2860_Linux_STA_v2.4.0.0.tar.gz Source11: rt2860-kmodtool-excludekernel-filterfile Patch1: rt2860-dat-install-fixes.patch @@ -48,6 +48,9 @@ %patch2 -p1 -b .NetworkManager %patch4 -p1 -b .no24 %patch6 -p1 -b .messageflood + for ext in c h; do + find . -name "*.$ext" -exec chmod -x {} \; + done popd for kernel_version in %{?kernel_versions} ; do @@ -72,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 22 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.0.0-1 +- version update (2.4.0.0) + * Sun Sep 19 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.3.0.0-1.6 - rebuild for new kernel rt2860-no2.4-in-kernelversion.patch: Makefile | 20 -------------------- os/linux/config.mk | 27 --------------------------- 2 files changed, 47 deletions(-) Index: rt2860-no2.4-in-kernelversion.patch =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/F-12/rt2860-no2.4-in-kernelversion.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rt2860-no2.4-in-kernelversion.patch 7 May 2010 07:17:02 -0000 1.3 +++ rt2860-no2.4-in-kernelversion.patch 22 Sep 2010 05:03:55 -0000 1.4 @@ -1,7 +1,7 @@ -diff -rupN 2010_01_29_RT2860_Linux_STA_v2.3.0.0.old/Makefile 2010_01_29_RT2860_Linux_STA_v2.3.0.0/Makefile ---- 2010_01_29_RT2860_Linux_STA_v2.3.0.0.old/Makefile 2009-12-23 01:15:08.000000000 -0500 -+++ 2010_01_29_RT2860_Linux_STA_v2.3.0.0/Makefile 2010-04-22 02:39:52.000000000 -0400 -@@ -176,13 +176,6 @@ test: +diff -rupN 2010_07_16_RT2860_Linux_STA_v2.4.0.0.old/Makefile 2010_07_16_RT2860_Linux_STA_v2.4.0.0/Makefile +--- 2010_07_16_RT2860_Linux_STA_v2.4.0.0.old/Makefile 2010-07-08 07:55:39.000000000 -0400 ++++ 2010_07_16_RT2860_Linux_STA_v2.4.0.0/Makefile 2010-08-29 16:28:25.000000000 -0400 +@@ -234,13 +234,6 @@ test: $(MAKE) -C tools test LINUX: @@ -15,11 +15,11 @@ 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 -@@ -194,34 +187,21 @@ else +@@ -252,34 +245,21 @@ else endif endif --endif +-endif clean: ifeq ($(TARGET), LINUX) @@ -50,10 +50,10 @@ endif -endif -diff -rupN 2010_01_29_RT2860_Linux_STA_v2.3.0.0.old/os/linux/config.mk 2010_01_29_RT2860_Linux_STA_v2.3.0.0/os/linux/config.mk ---- 2010_01_29_RT2860_Linux_STA_v2.3.0.0.old/os/linux/config.mk 2010-04-22 02:35:11.000000000 -0400 -+++ 2010_01_29_RT2860_Linux_STA_v2.3.0.0/os/linux/config.mk 2010-04-22 02:41:47.000000000 -0400 -@@ -218,14 +218,9 @@ WFLAGS += -DRT_BIG_ENDIAN -DINF_TWINPASS +diff -rupN 2010_07_16_RT2860_Linux_STA_v2.4.0.0.old/os/linux/config.mk 2010_07_16_RT2860_Linux_STA_v2.4.0.0/os/linux/config.mk +--- 2010_07_16_RT2860_Linux_STA_v2.4.0.0.old/os/linux/config.mk 2010-07-09 04:58:09.000000000 -0400 ++++ 2010_07_16_RT2860_Linux_STA_v2.4.0.0/os/linux/config.mk 2010-08-29 16:29:34.000000000 -0400 +@@ -250,14 +250,9 @@ WFLAGS += -DRT_BIG_ENDIAN -DINF_TWINPASS endif ifeq ($(PLATFORM),INF_DANUBE) @@ -68,7 +68,7 @@ ifeq ($(PLATFORM),INF_AR9) WFLAGS += -DRT_BIG_ENDIAN -DINF_AR9 -@@ -313,11 +308,7 @@ export CFLAGS +@@ -349,11 +344,7 @@ export CFLAGS endif ifeq ($(PLATFORM),INF_DANUBE) @@ -80,7 +80,7 @@ export CFLAGS endif -@@ -342,14 +333,8 @@ export CFLAGS +@@ -383,14 +374,8 @@ export CFLAGS endif ifeq ($(PLATFORM),PC) @@ -90,8 +90,39 @@ - export CFLAGS - else # Linux 2.6 - EXTRA_CFLAGS := $(WFLAGS) -DMODVERSIONS -I$(RT28xx_DIR)/include + EXTRA_CFLAGS := $(WFLAGS) -I$(RT28xx_DIR)/include +- endif + endif + + #If the kernel version of RMI is newer than 2.6.27, please change "CFLAGS" to "EXTRA_FLAGS" +@@ -441,11 +426,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_ \ +@@ -458,18 +438,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),IXP) + ifeq ($(PLATFORM),MVL5) rt2860-suppress-flood.patch: cmm_asic.c | 4 ++-- rt_ate.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Index: rt2860-suppress-flood.patch =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/F-12/rt2860-suppress-flood.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rt2860-suppress-flood.patch 22 Aug 2009 19:18:27 -0000 1.1 +++ rt2860-suppress-flood.patch 22 Sep 2010 05:03:55 -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_07_16_RT2860_Linux_STA_v2.4.0.0.old/common/cmm_asic.c 2010_07_16_RT2860_Linux_STA_v2.4.0.0/common/cmm_asic.c +--- 2010_07_16_RT2860_Linux_STA_v2.4.0.0.old/common/cmm_asic.c 2010-07-08 07:30:47.000000000 -0400 ++++ 2010_07_16_RT2860_Linux_STA_v2.4.0.0/common/cmm_asic.c 2010-08-29 16:31:58.000000000 -0400 +@@ -934,7 +934,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( +@@ -948,7 +948,7 @@ VOID AsicSwitchChannel( TxPwer2 = (7+TxPwer2); TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2); R4 |= (TxPwer2 << 7); @@ -19,36 +19,24 @@ } 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_07_16_RT2860_Linux_STA_v2.4.0.0.old/common/rt_ate.c 2010_07_16_RT2860_Linux_STA_v2.4.0.0/common/rt_ate.c +--- 2010_07_16_RT2860_Linux_STA_v2.4.0.0.old/common/rt_ate.c 2010-07-08 07:43:17.000000000 -0400 ++++ 2010_07_16_RT2860_Linux_STA_v2.4.0.0/common/rt_ate.c 2010-08-29 16:36:18.000000000 -0400 +@@ -4512,7 +4512,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( +@@ -4526,7 +4526,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 * - - 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)); - return 0; - } - #endif Index: sources =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/F-12/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 7 May 2010 07:17:02 -0000 1.7 +++ sources 22 Sep 2010 05:03:55 -0000 1.8 @@ -1 +1 @@ -f97d72097ef12b3a4978444d0c4741e2 2010_01_29_RT2860_Linux_STA_v2.3.0.0.tar.bz2 +b2623a02a006e1b18eea1b9ab58495f0 2010_07_16_RT2860_Linux_STA_v2.4.0.0.tar.gz