rpms/rt2860-kmod/devel rt2860-2.6.25-iwe_stream-fix.diff, 1.1, 1.2 rt2860-add-network-mgr-support.diff, 1.1, 1.2 rt2860-dat-install-fixes.patch, 1.1, 1.2 rt2860-kmod.spec, 1.7, 1.8 rt2860-remove-tftpboot-copy.patch, 1.1, 1.2 rt2860-1.8.0.0-2.6.25-iwe_stream-fix.patch, 1.1, NONE rt2860-1.8.0.0-Makefile.x-fixes.patch, 1.1, NONE rt2860-1.8.0.0-NetworkManager-support.patch, 1.1, NONE rt2860-1.8.0.0-strip-tftpboot-copy.patch, 1.1, NONE

Orcan Ogetbil oget at rpmfusion.org
Sun Oct 19 22:25:43 CEST 2008 

Author: oget

Update of /cvs/free/rpms/rt2860-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24912

Modified Files:
	rt2860-2.6.25-iwe_stream-fix.diff 
	rt2860-add-network-mgr-support.diff 
	rt2860-dat-install-fixes.patch rt2860-kmod.spec 
	rt2860-remove-tftpboot-copy.patch 
Removed Files:
	rt2860-1.8.0.0-2.6.25-iwe_stream-fix.patch 
	rt2860-1.8.0.0-Makefile.x-fixes.patch 
	rt2860-1.8.0.0-NetworkManager-support.patch 
	rt2860-1.8.0.0-strip-tftpboot-copy.patch 
Log Message:
* Sun Oct 19 2008 Orcan Ogetbil <orcanbahri[at]yahoo[com]> 1.8.0.0-1.1
- update strip-tftpboot-copy.patch to match rt2860 sources with no fuzziness
- revert the patch names to the old versions


rt2860-2.6.25-iwe_stream-fix.diff:

Index: rt2860-2.6.25-iwe_stream-fix.diff
===================================================================
RCS file: /cvs/free/rpms/rt2860-kmod/devel/rt2860-2.6.25-iwe_stream-fix.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rt2860-2.6.25-iwe_stream-fix.diff	2 Oct 2008 20:36:05 -0000	1.1
+++ rt2860-2.6.25-iwe_stream-fix.diff	19 Oct 2008 20:25:42 -0000	1.2
@@ -1,102 +1,12 @@
-diff -u -r 2008_0708_RT2860_Linux_STA_v1.7.0.0/os/linux/sta_ioctl.c 2008_0708_RT2860_Linux_STA_v1.7.0.0.new/os/linux/sta_ioctl.c
---- 2008_0708_RT2860_Linux_STA_v1.7.0.0/os/linux/sta_ioctl.c	2008-07-04 01:01:00.000000000 -0500
-+++ 2008_0708_RT2860_Linux_STA_v1.7.0.0.new/os/linux/sta_ioctl.c	2008-08-28 17:20:08.000000000 -0500
-@@ -1073,7 +1073,7 @@
- 				memcpy(iwe.u.ap_addr.sa_data, &pAdapter->ScanTab.BssEntry[i].Bssid, ETH_ALEN);
+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	2008-09-25 04:28:00.000000000 -0400
++++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/sta_ioctl.c	2008-10-04 16:15:19.000000000 -0400
+@@ -49,7 +49,7 @@ extern ULONG    RTDebugLevel;
  
-         previous_ev = current_ev;
--			current_ev = iwe_stream_add_event(current_ev,end_buf, &iwe, IW_EV_ADDR_LEN);
-+	current_ev = iwe_stream_add_event(info,current_ev,end_buf, &iwe, IW_EV_ADDR_LEN);
-         if (current_ev == previous_ev)
- #if WIRELESS_EXT >= 17
-             return -E2BIG;
-@@ -1089,7 +1089,7 @@
- 		iwe.u.data.flags = 1;
-  
-         previous_ev = current_ev;
--		current_ev = iwe_stream_add_point(current_ev,end_buf, &iwe, pAdapter->ScanTab.BssEntry[i].Ssid);
-+	current_ev = iwe_stream_add_point(info,current_ev,end_buf, &iwe, pAdapter->ScanTab.BssEntry[i].Ssid);
-         if (current_ev == previous_ev)
- #if WIRELESS_EXT >= 17
-             return -E2BIG;
-@@ -1116,7 +1116,7 @@
- 		iwe.len = IW_EV_UINT_LEN;
+ #define GROUP_KEY_NO                4
  
-         previous_ev = current_ev;
--		current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,  IW_EV_UINT_LEN);
-+	current_ev = iwe_stream_add_event(info,current_ev, end_buf, &iwe,  IW_EV_UINT_LEN);
-         if (current_ev == previous_ev)
- #if WIRELESS_EXT >= 17
-             return -E2BIG;
-@@ -1136,7 +1136,7 @@
- 		iwe.u.freq.i = 0;
- 		
- 		previous_ev = current_ev;
--		current_ev = iwe_stream_add_event(current_ev,end_buf, &iwe, IW_EV_FREQ_LEN);
-+		current_ev = iwe_stream_add_event(info,current_ev,end_buf, &iwe, IW_EV_FREQ_LEN);
-         if (current_ev == previous_ev)
- #if WIRELESS_EXT >= 17
-             return -E2BIG;
-@@ -1151,7 +1151,7 @@
-     	iwe.u.qual.level = 0;
-     	iwe.u.qual.noise = 0;
-         set_quality(pAdapter, &iwe.u.qual, pAdapter->ScanTab.BssEntry[i].Rssi);
--    	current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
-+    	current_ev = iwe_stream_add_event(info,current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
-         if (current_ev == previous_ev)
- #if WIRELESS_EXT >= 17
-             return -E2BIG;
-@@ -1169,7 +1169,7 @@
- 			iwe.u.data.flags = IW_ENCODE_DISABLED;
- 
-         previous_ev = current_ev;		
--        current_ev = iwe_stream_add_point(current_ev, end_buf,&iwe, (char *)pAdapter->SharedKey[BSS0][(iwe.u.data.flags & IW_ENCODE_INDEX)-1].Key);
-+        current_ev = iwe_stream_add_point(info,current_ev, end_buf,&iwe, (char *)pAdapter->SharedKey[BSS0][(iwe.u.data.flags & IW_ENCODE_INDEX)-1].Key);
-         if (current_ev == previous_ev)
- #if WIRELESS_EXT >= 17
-             return -E2BIG;
-@@ -1197,7 +1197,7 @@
-     		    iwe.u.bitrate.value =  (tmpRate/2) * 1000000;
-             
- 			iwe.u.bitrate.disabled = 0;
--			current_val = iwe_stream_add_value(current_ev,
-+			current_val = iwe_stream_add_value(info,current_ev,
- 				current_val, end_buf, &iwe,
-     			IW_EV_PARAM_LEN);            
- 
-@@ -1221,7 +1221,7 @@
- 						   pAdapter->ScanTab.BssEntry[i].WpaIE.IELen);
- 			iwe.cmd = IWEVGENIE;
- 			iwe.u.data.length = pAdapter->ScanTab.BssEntry[i].WpaIE.IELen;
--			current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom);
-+			current_ev = iwe_stream_add_point(info,current_ev, end_buf, &iwe, custom);
- 			if (current_ev == previous_ev)
- #if WIRELESS_EXT >= 17
-                 return -E2BIG;
-@@ -1239,7 +1239,7 @@
- 						   pAdapter->ScanTab.BssEntry[i].RsnIE.IELen);
- 			iwe.cmd = IWEVGENIE;
- 			iwe.u.data.length = pAdapter->ScanTab.BssEntry[i].RsnIE.IELen;
--			current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom);
-+			current_ev = iwe_stream_add_point(info,current_ev, end_buf, &iwe, custom);
- 			if (current_ev == previous_ev)
- #if WIRELESS_EXT >= 17
-                 return -E2BIG;
-@@ -1260,7 +1260,7 @@
-             for (idx = 0; idx < pAdapter->ScanTab.BssEntry[i].WpaIE.IELen; idx++)
-                 sprintf(custom, "%s%02x", custom, pAdapter->ScanTab.BssEntry[i].WpaIE.IE[idx]);
-             previous_ev = current_ev;
--    		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,  custom);
-+	    current_ev = iwe_stream_add_point(info,current_ev, end_buf, &iwe,  custom);
-             if (current_ev == previous_ev)
- #if WIRELESS_EXT >= 17
-                 return -E2BIG;
-@@ -1280,7 +1280,7 @@
- 			for (idx = 0; idx < pAdapter->ScanTab.BssEntry[i].RsnIE.IELen; idx++)
-                 sprintf(custom, "%s%02x", custom, pAdapter->ScanTab.BssEntry[i].RsnIE.IE[idx]);
-             previous_ev = current_ev;
--    		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,  custom);
-+	    current_ev = iwe_stream_add_point(info,current_ev, end_buf, &iwe,  custom);
-             if (current_ev == previous_ev)
- #if WIRELESS_EXT >= 17
-                 return -E2BIG;
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
+ #define IWE_STREAM_ADD_EVENT(_A, _B, _C, _D, _E)		iwe_stream_add_event(_A, _B, _C, _D, _E)
+ #define IWE_STREAM_ADD_POINT(_A, _B, _C, _D, _E)		iwe_stream_add_point(_A, _B, _C, _D, _E)
+ #define IWE_STREAM_ADD_VALUE(_A, _B, _C, _D, _E, _F)	iwe_stream_add_value(_A, _B, _C, _D, _E, _F)

rt2860-add-network-mgr-support.diff:

Index: rt2860-add-network-mgr-support.diff
===================================================================
RCS file: /cvs/free/rpms/rt2860-kmod/devel/rt2860-add-network-mgr-support.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rt2860-add-network-mgr-support.diff	2 Oct 2008 20:36:05 -0000	1.1
+++ rt2860-add-network-mgr-support.diff	19 Oct 2008 20:25:42 -0000	1.2
@@ -1,7 +1,6 @@
-diff -u -r 2008_0708_RT2860_Linux_STA_v1.7.0.0/os/linux/config.mk 2008_0708_RT2860_Linux_STA_v1.7.0.0.new/os/linux/config.mk
---- 2008_0708_RT2860_Linux_STA_v1.7.0.0/os/linux/config.mk	2008-07-07 09:37:50.000000000 -0500
-+++ 2008_0708_RT2860_Linux_STA_v1.7.0.0.new/os/linux/config.mk	2008-08-28 17:54:07.000000000 -0500
-@@ -5,10 +5,10 @@
+--- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/config.mk	2008-09-25 04:25:42.000000000 -0400
++++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/config.mk	2008-10-04 16:39:05.000000000 -0400
+@@ -5,10 +5,10 @@ HAS_ATE=n
  HAS_28xx_QA=n
  
  # Support Wpa_Supplicant

rt2860-dat-install-fixes.patch:

Index: rt2860-dat-install-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/rt2860-kmod/devel/rt2860-dat-install-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rt2860-dat-install-fixes.patch	2 Oct 2008 20:36:05 -0000	1.1
+++ rt2860-dat-install-fixes.patch	19 Oct 2008 20:25:42 -0000	1.2
@@ -1,16 +1,50 @@
-diff -u -r 2008_0708_RT2860_Linux_STA_v1.7.0.0/os/linux/Makefile.6 2008_0708_RT2860_Linux_STA_v1.7.0.0.new/os/linux/Makefile.6
---- 2008_0708_RT2860_Linux_STA_v1.7.0.0/os/linux/Makefile.6	2008-06-30 20:18:02.000000000 -0500
-+++ 2008_0708_RT2860_Linux_STA_v1.7.0.0.new/os/linux/Makefile.6	2008-08-29 11:59:46.000000000 -0500
-@@ -1,7 +1,7 @@
+diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/Makefile.4 new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/Makefile.4
+--- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/Makefile.4	2008-09-18 04:12:12.000000000 -0400
++++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/Makefile.4	2008-10-04 16:51:37.000000000 -0400
+@@ -1,8 +1,6 @@
+ include $(RT28xx_DIR)/os/linux/config.mk 
+ 
+ MOD_NAME = rt$(CHIPSET)sta
+-DAT_PATH = /etc/Wireless/RT$(CHIPSET)STA
+-DAT_FILE_NAME = RT$(CHIPSET)STA.dat
+ 
+ OBJ := $(MOD_NAME).o
+ 
+@@ -78,15 +76,12 @@ clean:
+ 	rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d}
+ 
+ install:
+-	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}
++	#install -d $(LINUX_SRC_MODULE)
++	#install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(LINUX_SRC_MODULE)
++	mkdir -p $(INST_DIR)
++	install -d $(INST_DIR)
++	install -m 644 -c $(addsuffix .ko,$(MOD_NAME))  $(INST_DIR)
++	#/sbin/depmod -a ${shell uname -r}
+ 
+ uninstall:
+-#	rm -rf $(DAT_PATH)
+-	rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .o,$(MOD_NAME)))
+ 	/sbin/depmod -a ${shell uname -r}
+diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/Makefile.6 new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/Makefile.6
+--- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/Makefile.6	2008-09-18 04:12:42.000000000 -0400
++++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/Makefile.6	2008-10-04 16:50:54.000000000 -0400
+@@ -1,8 +1,6 @@
  include $(RT28xx_DIR)/os/linux/config.mk
  
  MOD_NAME = rt$(CHIPSET)sta
 -DAT_PATH = /etc/Wireless/RT$(CHIPSET)STA
-+DAT_PATH = $(DAT_PREFIX)/etc/Wireless/RT$(CHIPSET)STA
- DAT_FILE_NAME = RT$(CHIPSET)STA.dat
+-DAT_FILE_NAME = RT$(CHIPSET)STA.dat
  
  obj-m := $(MOD_NAME).o
-@@ -75,15 +75,11 @@
+ 
+@@ -77,15 +75,11 @@ clean:
  	rm -f ../../sta/.*.{cmd,flags,d}
  
  install:
@@ -18,13 +52,16 @@
 -	$(shell [ ! -f /etc/Wireless ] && mkdir /etc/Wireless)
 -	mkdir $(DAT_PATH)
 -	cp $(RT28xx_DIR)/$(DAT_FILE_NAME) $(DAT_PATH)/.
-+	install -d $(DAT_PATH)
-+	install -m 644 $(RT28xx_DIR)/$(DAT_FILE_NAME) $(DAT_PATH)
- 	install -d $(LINUX_SRC_MODULE)
- 	install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE)
+-	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 -d $(INST_DIR)
++	#install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE)
++	install -m 644 -c $(addsuffix .ko,$(MOD_NAME))  $(INST_DIR)
++	#/sbin/depmod -a ${shell uname -r}
  uninstall:
- #	rm -rf $(DAT_PATH)
+-#	rm -rf $(DAT_PATH)
  	rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .ko,$(MOD_NAME)))
--	/sbin/depmod -a ${shell uname -r}
+ 	/sbin/depmod -a ${shell uname -r}


Index: rt2860-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2860-kmod/devel/rt2860-kmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rt2860-kmod.spec	19 Oct 2008 18:54:16 -0000	1.7
+++ rt2860-kmod.spec	19 Oct 2008 20:25:42 -0000	1.8
@@ -7,7 +7,7 @@
 
 Name:		rt2860-kmod
 Version:	1.8.0.0
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 Summary:	Kernel module for RaLink 802.11 wireless devices rt2760/rt2790/rt2860/rt2890
 
 Group:		System Environment/Kernel
@@ -15,10 +15,10 @@
 URL:		http://www.ralinktech.com/ralink/Home/Support/Linux.html
 Source0:	http://www.ralinktech.com.tw/data/drivers/2008_0918_RT2860_Linux_STA_v1.8.0.0.tar.bz2
 Source11:	rt2860-kmodtool-excludekernel-filterfile
-Patch0:		rt2860-1.8.0.0-2.6.25-iwe_stream-fix.patch
-Patch1:		rt2860-1.8.0.0-Makefile.x-fixes.patch
-Patch2:		rt2860-1.8.0.0-NetworkManager-support.patch
-Patch3:		rt2860-1.8.0.0-strip-tftpboot-copy.patch
+Patch0:		rt2860-2.6.25-iwe_stream-fix.diff
+Patch1:		rt2860-dat-install-fixes.patch
+Patch2:		rt2860-add-network-mgr-support.diff
+Patch3:		rt2860-remove-tftpboot-copy.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	%{_bindir}/kmodtool
@@ -73,6 +73,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sun Oct 19 2008 Orcan Ogetbil <orcanbahri[at]yahoo[com]> 1.8.0.0-1.1
+- update strip-tftpboot-copy.patch to match rt2860 sources with no fuzziness
+- revert the patch names to the old versions
+
 * Sun Oct 19 2008 Orcan Ogetbil <orcanbahri[at]yahoo[com]> 1.8.0.0-1
 - version update (1.8.0.0)
 - patches taken from rt2870-kmod directly

rt2860-remove-tftpboot-copy.patch:

Index: rt2860-remove-tftpboot-copy.patch
===================================================================
RCS file: /cvs/free/rpms/rt2860-kmod/devel/rt2860-remove-tftpboot-copy.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rt2860-remove-tftpboot-copy.patch	2 Oct 2008 20:36:05 -0000	1.1
+++ rt2860-remove-tftpboot-copy.patch	19 Oct 2008 20:25:42 -0000	1.2
@@ -1,15 +1,31 @@
-diff -u -r 2008_0708_RT2860_Linux_STA_v1.7.0.0/Makefile 2008_0708_RT2860_Linux_STA_v1.7.0.0.new/Makefile
---- 2008_0708_RT2860_Linux_STA_v1.7.0.0/Makefile	2008-06-30 20:20:26.000000000 -0500
-+++ 2008_0708_RT2860_Linux_STA_v1.7.0.0.new/Makefile	2008-08-29 11:42:25.000000000 -0500
-@@ -101,11 +101,9 @@
+diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile new/2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile
+--- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile	2008-09-17 22:26:56.000000000 -0400
++++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile	2008-10-19 15:43:22.000000000 -0400
+@@ -125,27 +125,9 @@ LINUX:
  ifneq (,$(findstring 2.4,$(LINUX_SRC)))
  	cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile
  	make -C $(RT28xx_DIR)/os/linux/
+-ifeq ($(RT28xx_MODE),AP)
+-	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot
+-else	
+-ifeq ($(RT28xx_MODE),APSTA)
+-	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot
+-else
 -	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
+-endif	
+-endif	
  else
  	cp -f os/linux/Makefile.6 $(RT28xx_DIR)/os/linux/Makefile
  	make  -C  $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
+-ifeq ($(RT28xx_MODE),AP)
+-	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot
+-else	
+-ifeq ($(RT28xx_MODE),APSTA)
+-	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot
+-else
 -	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
- endif	
+-endif	
+-endif
+ endif
  
  clean:


--- rt2860-1.8.0.0-2.6.25-iwe_stream-fix.patch DELETED ---


--- rt2860-1.8.0.0-Makefile.x-fixes.patch DELETED ---


--- rt2860-1.8.0.0-NetworkManager-support.patch DELETED ---


--- rt2860-1.8.0.0-strip-tftpboot-copy.patch DELETED ---

More information about the rpmfusion-commits mailing list