r10 - unstable/rt2500/debian/patches

[Romain Beauxis]

Author: toots
Date: 2007-03-15 13:23:15 +0000 (Thu, 15 Mar 2007)
New Revision: 10

Modified:
   unstable/rt2500/debian/patches/2.6.19.diff
Log:
Fix for bug #399051

Modified: unstable/rt2500/debian/patches/2.6.19.diff
===================================================================
--- unstable/rt2500/debian/patches/2.6.19.diff	2007-03-06 23:08:00 UTC (rev 9)
+++ unstable/rt2500/debian/patches/2.6.19.diff	2007-03-15 13:23:15 UTC (rev 10)
@@ -19,45 +19,38 @@
      IN  unsigned long data);
 --- Module/rtmp_info.c	2006/08/19 23:51:27	1.68
 +++ Module/rtmp_info.c	2006/12/27 21:09:31	1.69
-@@ -1632,6 +1632,7 @@
-     USHORT                              subcmd;
-     BOOLEAN                             StateMachineTouched = FALSE;
-     int                                 i, chan = -1, index = 0, len = 0;
-+    ULONG				Length;
- 
- 
      switch(cmd) {
 @@ -1650,23 +1651,29 @@
                      break;
                  }
  
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+		Length = erq->length - 1; // minux null character.
++		#define customLength (erq->length - 1) // minux null character.
 +#else
-+		Length = erq->length;
++		#define customLength (erq->length)
 +#endif
 +
  		if(RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
  		{
 -                	if (copy_from_user(Ssid.Ssid, erq->pointer, (erq->length - 1)))
-+                	if (copy_from_user(Ssid.Ssid, erq->pointer, Length))
++                	if (copy_from_user(Ssid.Ssid, erq->pointer, customLength))
                  	{
                     	 Status = -EFAULT;
                     	 break;
                  	}
 -                	Ssid.SsidLength = erq->length - 1;  //minus null character.
-+                	Ssid.SsidLength = Length;
++                	Ssid.SsidLength = customLength;
  		}else{
  			// This SEEMS to be needed to actual work RobinC when iface
  			// is down
 -	                if (copy_from_user(pAdapter->PortCfg.Ssid, erq->pointer, (erq->length - 1)))
-+	                if (copy_from_user(pAdapter->PortCfg.Ssid, erq->pointer, Length))
++	                if (copy_from_user(pAdapter->PortCfg.Ssid, erq->pointer, customLength))
  	                {
  	                    Status = -EFAULT;
  	                    break;
  	                }
 -	                pAdapter->PortCfg.SsidLen = erq->length - 1;  //minus null character.
-+	                pAdapter->PortCfg.SsidLen = Length;
++	                pAdapter->PortCfg.SsidLen = customLength;
  
  			memcpy(pAdapter->Mlme.CntlAux.Ssid, pAdapter->PortCfg.Ssid, pAdapter->PortCfg.SsidLen);	
  			pAdapter->Mlme.CntlAux.SsidLen = pAdapter->PortCfg.SsidLen;