rpms/rt3070-kmod/devel rt3070-2.6.29-compile.patch, 1.1, 1.2 rt3070-kmod.spec, 1.1, 1.2

[Orcan Ogetbil]

Author: oget

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

Modified Files:
	rt3070-2.6.29-compile.patch rt3070-kmod.spec 
Log Message:
* Sun Feb 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.0.1.0-2
- Fix the 2.6.29 patch


rt3070-2.6.29-compile.patch:

Index: rt3070-2.6.29-compile.patch
===================================================================
RCS file: /cvs/free/rpms/rt3070-kmod/devel/rt3070-2.6.29-compile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rt3070-2.6.29-compile.patch	22 Feb 2009 16:46:12 -0000	1.1
+++ rt3070-2.6.29-compile.patch	22 Feb 2009 18:07:43 -0000	1.2
@@ -1,6 +1,6 @@
 diff -rupN old/2008_1225_RT3070_Linux_STA_v2.0.1.0/common/2870_rtmp_init.c new/2008_1225_RT3070_Linux_STA_v2.0.1.0/common/2870_rtmp_init.c
 --- old/2008_1225_RT3070_Linux_STA_v2.0.1.0/common/2870_rtmp_init.c	2008-12-24 01:24:20.000000000 -0500
-+++ new/2008_1225_RT3070_Linux_STA_v2.0.1.0/common/2870_rtmp_init.c	2009-01-15 12:00:16.000000000 -0500
++++ new/2008_1225_RT3070_Linux_STA_v2.0.1.0/common/2870_rtmp_init.c	2009-02-22 12:41:55.000000000 -0500
 @@ -751,7 +751,7 @@ Note:
  NDIS_STATUS	 CreateThreads( 
  	IN	struct net_device *net_dev)
@@ -10,9 +10,36 @@
  	POS_COOKIE pObj = (POS_COOKIE) pAd->OS_Cookie;
  
  	//init_MUTEX(&(pAd->usbdev_semaphore));
+diff -rupN old/2008_1225_RT3070_Linux_STA_v2.0.1.0/common/eeprom.c new/2008_1225_RT3070_Linux_STA_v2.0.1.0/common/eeprom.c
+--- old/2008_1225_RT3070_Linux_STA_v2.0.1.0/common/eeprom.c	2008-12-24 01:33:02.000000000 -0500
++++ new/2008_1225_RT3070_Linux_STA_v2.0.1.0/common/eeprom.c	2009-02-22 12:48:02.000000000 -0500
+@@ -1065,9 +1065,9 @@ INT	set_eFuseLoadFromBin_Proc(
+ 		kfree(buffer);
+ 		return FALSE;
+ 	}
+-	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);
+ 
+@@ -1130,8 +1130,10 @@ INT	set_eFuseLoadFromBin_Proc(
+ 		DBGPRINT(RT_DEBUG_TRACE, ("--> Error %d closing %s\n", -retval, src));
+ 	}
+ 	set_fs(orgfs);
++#if 0
+ 	current->fsuid = orgfsuid;
+ 	current->fsgid = orgfsgid;
++#endif
+ 	for(j=0;j<i;j++)
+ 	{
+ 		DBGPRINT(RT_DEBUG_TRACE, ("%02X ",buffer[j]));
 diff -rupN old/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/rt_main_dev.c new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/rt_main_dev.c
 --- old/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/rt_main_dev.c	2008-12-24 02:36:30.000000000 -0500
-+++ new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/rt_main_dev.c	2009-01-15 11:59:44.000000000 -0500
++++ new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/rt_main_dev.c	2009-02-22 12:41:55.000000000 -0500
 @@ -133,7 +133,7 @@ Note:
  */
  int MainVirtualIF_close(IN struct net_device *net_dev)
@@ -157,7 +184,7 @@
  	{
 diff -rupN old/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/rt_profile.c new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/rt_profile.c
 --- old/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/rt_profile.c	2008-12-24 02:06:26.000000000 -0500
-+++ new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/rt_profile.c	2009-01-15 11:59:41.000000000 -0500
++++ new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/rt_profile.c	2009-02-22 12:41:55.000000000 -0500
 @@ -925,9 +925,9 @@ NDIS_STATUS	RTMPReadParametersHook(
  
  	// Save uid and gid used for filesystem access.
@@ -185,7 +212,7 @@
  
 diff -rupN old/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/sta_ioctl.c new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/sta_ioctl.c
 --- old/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/sta_ioctl.c	2008-12-23 21:54:58.000000000 -0500
-+++ new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/sta_ioctl.c	2009-01-15 11:59:34.000000000 -0500
++++ new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/sta_ioctl.c	2009-02-22 12:41:55.000000000 -0500
 @@ -579,7 +579,7 @@ rt_ioctl_giwname(struct net_device *dev,
  		   struct iw_request_info *info,
  		   char *name, char *extra)


Index: rt3070-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt3070-kmod/devel/rt3070-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rt3070-kmod.spec	22 Feb 2009 16:46:12 -0000	1.1
+++ rt3070-kmod.spec	22 Feb 2009 18:07:44 -0000	1.2
@@ -7,7 +7,7 @@
 
 Name:		rt3070-kmod
 Version:	2.0.1.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Kernel module for wireless devices with Ralink's rt307x chipsets
 
 Group:		System Environment/Kernel
@@ -85,5 +85,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sun Feb 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.0.1.0-2
+- Fix the 2.6.29 patch
+
 * Thu Jan 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.0.1.0-1
 - Initial build