r180 - in tags: . rt2400-1.2.2+cvs20080623-4 rt2400-1.2.2+cvs20080623-4/debian rt2400-1.2.2+cvs20080623-4/debian/patches rt2500-1:1.1.0-b4+cvs20080623-4 rt2500-1:1.1.0-b4+cvs20080623-4/debian rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches rt2570-1.1.0+cvs20080623-3 rt2570-1.1.0+cvs20080623-3/debian rt2570-1.1.0+cvs20080623-3/debian/patches rt73-1:1.0.3.6-cvs20080623-dfsg1-4 rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/conf rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches

Ben Hutchings benh at alioth.debian.org
Tue Apr 14 03:06:50 UTC 2009


Author: benh
Date: 2009-04-14 03:06:50 +0000 (Tue, 14 Apr 2009)
New Revision: 180

Added:
   tags/rt2400-1.2.2+cvs20080623-4/
   tags/rt2400-1.2.2+cvs20080623-4/debian/NEWS
   tags/rt2400-1.2.2+cvs20080623-4/debian/README.source
   tags/rt2400-1.2.2+cvs20080623-4/debian/changelog
   tags/rt2400-1.2.2+cvs20080623-4/debian/control
   tags/rt2400-1.2.2+cvs20080623-4/debian/control.modules.in
   tags/rt2400-1.2.2+cvs20080623-4/debian/patches/000_if_name.diff
   tags/rt2400-1.2.2+cvs20080623-4/debian/patches/002_no_config_file.diff
   tags/rt2400-1.2.2+cvs20080623-4/debian/patches/003_use_netdev_functions.diff
   tags/rt2400-1.2.2+cvs20080623-4/debian/patches/series
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/NEWS
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/README.source
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/changelog
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/control
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/control.modules.in
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/000_if_name.diff
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/005_fix_error_rate_vars.diff
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/007_no_config_file.diff
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/008_use_netdev_functions.diff
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/009_iwe_stream_update.diff
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/series
   tags/rt2570-1.1.0+cvs20080623-3/
   tags/rt2570-1.1.0+cvs20080623-3/debian/NEWS
   tags/rt2570-1.1.0+cvs20080623-3/debian/README.source
   tags/rt2570-1.1.0+cvs20080623-3/debian/changelog
   tags/rt2570-1.1.0+cvs20080623-3/debian/control
   tags/rt2570-1.1.0+cvs20080623-3/debian/control.modules.in
   tags/rt2570-1.1.0+cvs20080623-3/debian/patches/008_use_netdev_functions.diff
   tags/rt2570-1.1.0+cvs20080623-3/debian/patches/009_use_kill_pid.diff
   tags/rt2570-1.1.0+cvs20080623-3/debian/patches/010_iwe_stream_update.diff
   tags/rt2570-1.1.0+cvs20080623-3/debian/patches/series
   tags/rt2570-1.1.0+cvs20080623-3/debian/rules
   tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/
   tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/README
   tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/README.source
   tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/changelog
   tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/control.modules.in
   tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/packages
   tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/004_use_netdev_ml_priv.diff
   tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/005_use_kill_pid.diff
   tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/006_iwe_stream_update.diff
   tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/007_fix_max_usb_packet_size.diff
   tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/series
Removed:
   tags/rt2400-1.2.2+cvs20080623-4/debian/changelog
   tags/rt2400-1.2.2+cvs20080623-4/debian/control
   tags/rt2400-1.2.2+cvs20080623-4/debian/control.modules.in
   tags/rt2400-1.2.2+cvs20080623-4/debian/patches/000_if_name.diff
   tags/rt2400-1.2.2+cvs20080623-4/debian/patches/series
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/NEWS
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/changelog
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/control
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/control.modules.in
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/000_if_name.diff
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/005_fix_error_rate_vars.diff
   tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/series
   tags/rt2570-1.1.0+cvs20080623-3/debian/changelog
   tags/rt2570-1.1.0+cvs20080623-3/debian/control
   tags/rt2570-1.1.0+cvs20080623-3/debian/control.modules.in
   tags/rt2570-1.1.0+cvs20080623-3/debian/patches/series
   tags/rt2570-1.1.0+cvs20080623-3/debian/rules
   tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/README
   tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/changelog
   tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/conf/rt73.modprobe
   tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/control.modules.in
   tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/packages
Log:
Tag today's releases



Property changes on: tags/rt2400-1.2.2+cvs20080623-4
___________________________________________________________________
Added: mergeWithUpstream
   + 1
Added: svn:mergeinfo
   + 

Copied: tags/rt2400-1.2.2+cvs20080623-4/debian/NEWS (from rev 179, unstable/rt2400/debian/NEWS)
===================================================================
--- tags/rt2400-1.2.2+cvs20080623-4/debian/NEWS	                        (rev 0)
+++ tags/rt2400-1.2.2+cvs20080623-4/debian/NEWS	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,10 @@
+rt2400 (1.2.2+cvs20080623-4) unstable; urgency=low
+
+  * rt2400 is no longer supported by Ralink or the community around
+    rt2x00.serialmonkey.net.  We cannot provide much support for it, and
+    recommend that you use the rt2400pci driver included with the Linux
+    kernel.
+  * If rt2400 works (or used to work) with your card but rt2400pci does
+    not, please report a bug against the linux-2.6 package.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 14 Apr 2009 02:09:07 +0100

Copied: tags/rt2400-1.2.2+cvs20080623-4/debian/README.source (from rev 169, unstable/rt2400/debian/README.source)
===================================================================
--- tags/rt2400-1.2.2+cvs20080623-4/debian/README.source	                        (rev 0)
+++ tags/rt2400-1.2.2+cvs20080623-4/debian/README.source	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,4 @@
+Changes to upstream source are organised as a quilt patch series.
+
+Run debian/rules patch to apply all patches and debian/rules unpatch
+to remove them.  See the quilt documentation for more information.

Deleted: tags/rt2400-1.2.2+cvs20080623-4/debian/changelog
===================================================================
--- unstable/rt2400/debian/changelog	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt2400-1.2.2+cvs20080623-4/debian/changelog	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,227 +0,0 @@
-rt2400 (1.2.2+cvs20080623-3) unstable; urgency=high
-
-  * Fixed buffer overflow vulnerability in processing of ad-hoc probe
-    requests (CVE-2009-0282) (closes: bug#512999)
-
- -- Ben Hutchings <ben at decadent.org.uk>  Wed, 28 Jan 2009 00:23:31 +0000
-
-rt2400 (1.2.2+cvs20080623-2) unstable; urgency=low
-
-  * Modified 000_if_name.diff to apply at -p1 (closes: bug#485258)
-
- -- Ben Hutchings <ben at decadent.org.uk>  Mon, 23 Jun 2008 14:40:12 +0100
-
-rt2400 (1.2.2+cvs20080623-1) unstable; urgency=low
-
-  * New CVS snapshot
-    - Obsoletes 004_fix_mlme_queue_locking.diff
-  * Copied recommendations and suggestions from modules packages to
-    rt2400-source to make them more visible
-
- -- Ben Hutchings <ben at decadent.org.uk>  Mon, 23 Jun 2008 00:12:29 +0100
-
-rt2400 (1.2.2+cvs20070911-1) unstable; urgency=low
-
-  * New CVS snapshot
-    - Removes RaConfig2400 utility and rt2400 binary package
-  * Added suggestion of rutilt package as a replacement for rt2400
-  * Fixed some race conditions in processing of queued work, with help
-    from Bryan Batten (004_fix_mlme_queue_locking.diff)
-  * Added dependency of rt2400-source on bzip2 (closes: bug#448715)
-
- -- Ben Hutchings <ben at decadent.org.uk>  Sun, 11 Nov 2007 23:57:45 +0000
-
-rt2400 (1.2.2+cvs20070219-3) unstable; urgency=low
-
-  * Workaround linux-libc-dev bug by including linux/if.h before
-    linux/wireless.h  (closes: bug#428996).
-  * patches/2.6.22.diff: fix the build of the module with 2.6.22+ kernels
-    (closes: bug#432532).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sun, 15 Jul 2007 19:12:43 +0200
-
-rt2400 (1.2.2+cvs20070219-2) unstable; urgency=low
-
-  * Switch maintainer to "Debian Ralink packages maintainers".
-  * Move Ben Hutchings to uploaders, and add Romain Beauxis to uploaders.
-  * Use quilt for patch management.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Mon,  5 Mar 2007 23:34:53 +0100
-
-rt2400 (1.2.2+cvs20070219-1) unstable; urgency=low
-
-   * Switch Maintainer and Uploader.
-   * New CVS snaphost.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 20 Feb 2007 00:51:27 +0100
-
-rt2400 (1.2.2+cvs20061231-2) unstable; urgency=low
-
-  * Use bzip2 instead of gzip to compress the sources.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Wed,  3 Jan 2007 20:53:59 +0100
-
-rt2400 (1.2.2+cvs20061231-1) unstable; urgency=low
-
-  * New CVS version.
-    - Fix SSID handling with kernels >= 2.6.19 (closes: bug#405009).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sun, 31 Dec 2006 18:29:13 +0100
-
-rt2400 (1.2.2+cvs20061210-1) unstable; urgency=low
-
-  * New CVS version. 
-    - Fix build with kernels >= 2.6.19 (closes: bug#401209).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sun, 10 Dec 2006 15:05:08 +0100
-
-rt2400 (1.2.2+cvs20060620-4) unstable; urgency=low
-
-  * debian/rules: fix a bashims (closes: bug#385205). 
-
- -- Aurelien Jarno <aurel32 at debian.org>  Wed, 30 Aug 2006 14:49:18 +0200
-
-rt2400 (1.2.2+cvs20060620-3) unstable; urgency=low
-
-  * Fixed a typo in the description. 
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue,  1 Aug 2006 16:23:05 +0200
-
-rt2400 (1.2.2+cvs20060620-2) unstable; urgency=low
-
-  * Fix build with kernels >= 2.6.17 (closes: bug#379085).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Fri, 21 Jul 2006 12:10:52 +0200
-
-rt2400 (1.2.2+cvs20060620-1) unstable; urgency=low
-
-  * New CVS version.
-  * Bumped Standards-Version to 3.7.2 (no changes).
-  * rt2400: stop recommending rt2400-module (closes: bug#376904).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 11 Jul 2006 10:39:56 +0200
-
-rt2400 (1.2.2+cvs20060417-4) unstable; urgency=low
-
-  * Rename rt2400-_KVERS_ into rt2400-modules-_KVERS_.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sat, 22 Apr 2006 20:17:52 +0200
-
-rt2400 (1.2.2+cvs20060417-3) unstable; urgency=low
-
-  * Added Ben Hutchings <ben at decadentplace.org.uk> to the Uploaders: field.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Thu, 20 Apr 2006 16:22:32 +0200
-
-rt2400 (1.2.2+cvs20060417-2) unstable; urgency=low
-
-  * Fix a typo in README.Debian. 
-
- -- Aurelien Jarno <aurel32 at debian.org>  Thu, 20 Apr 2006 03:31:20 +0200
-
-rt2400 (1.2.2+cvs20060417-1) unstable; urgency=low
-
-  * New CVS version.
-  * Put a link to /usr/share/doc/rt2400-source/README.Debian into the
-    root of rt2400.tar.gz, as users are unable to look in /usr/share/doc/
-    by themselves.
-  * Add a menu item for RaConfig2400.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 17 Apr 2006 16:20:47 +0200
-
-rt2400 (1.2.2+cvs20051217-2) unstable; urgency=low
-
-  * I have received reports that the rt2400 driver is also working with an 
-    SMP kernel, so disable the error message when compiling on such a kernel.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 19 Dec 2005 21:36:39 +0100
-
-rt2400 (1.2.2+cvs20051217-1) unstable; urgency=low
-
-  * New CVS version.
-  * Only suggests gcc-3.3 and fails if it is not installed when building
-    the module against a 2.4 kernel.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sun, 18 Dec 2005 00:12:48 +0100
-
-rt2400 (1.2.2+cvs20050730-6) unstable; urgency=low
-
-  * Really upload to unstable. 
-
- -- Aurelien Jarno <aurel32 at debian.org>  Wed,  2 Nov 2005 11:19:34 +0100
-
-rt2400 (1.2.2+cvs20050730-5) experimental; urgency=low
-
-  * Upload to unstable. 
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue,  1 Nov 2005 16:13:56 +0100
-
-rt2400 (1.2.2+cvs20050730-4) experimental; urgency=low
-
-  * Upload to experimental as unstable is semi-frozen. 
-  * Refuse to build the module on an SMP kernel.
-  * Only recommends linux-image-2.6.xx.
-  * Clarified the description of rt2400.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 31 Oct 2005 20:17:52 +0100
-
-rt2400 (1.2.2+cvs20050730-3) unstable; urgency=low
- 
-  * It's seems RT2400STA.dat is only used by the configuration tool.
-    Move this file in this package, and delete the rt2400-base package
-    (closes: bug#325897)
-  * Changed the name of the interface directly in the sources to be
-    able to get rid of rt2400-base.
-  * Added a README.Debian in the module package to explain how to
-    change the name of the interface.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Fri, 16 Sep 2005 11:14:31 +0200
-
-rt2400 (1.2.2+cvs20050730-2) unstable; urgency=low
-
-  * C++ transition: build-depends on libqt3-mt-dev (>= 3.3.4-4)
-    (closes: bug#320507). 
-
- -- Aurelien Jarno <aurel32 at debian.org>  Fri, 12 Aug 2005 00:03:00 +0200
-
-rt2400 (1.2.2+cvs20050730-1) unstable; urgency=low
-
-  * New CVS version corresponding to 1.2.2-b3.
-  * Fixed a bug in debian rules that was making the module unbuildable.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Fri,  5 Aug 2005 19:21:16 +0200
-
-rt2400 (1.2.2+cvs20050710-2) unstable; urgency=low
-
-  * Make the modules also depending on the kernel images which are using
-    the new kernel naming scheme.
-  * Only build modules with gcc-3.3 with 2.4 kernels.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Mon,  1 Aug 2005 01:57:33 +0200
-
-rt2400 (1.2.2+cvs20050710-1) unstable; urgency=low
-
-  * Upload from Debconf 5.
-  * New CVS version.
-  * Build modules ith gcc-3.3.
-  * Bumped Standards-Version to 3.6.2 (no changes).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 11 Jul 2005 10:44:27 +0300
-
-rt2400 (1.2.2+cvs20050618-1) unstable; urgency=low
-
-  * New CVS version. 
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sat, 18 Jun 2005 20:33:19 +0200
-
-rt2400 (1.2.2+cvs20050530-2) unstable; urgency=low
-
-  * Don't try to include README in the module package (closes: bug#312001). 
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sat,  4 Jun 2005 20:41:45 +0200
-
-rt2400 (1.2.2+cvs20050530-1) unstable; urgency=low
-
-  * Initial Release (closes: bug#285757).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 31 May 2005 07:23:11 +0200

Copied: tags/rt2400-1.2.2+cvs20080623-4/debian/changelog (from rev 177, unstable/rt2400/debian/changelog)
===================================================================
--- tags/rt2400-1.2.2+cvs20080623-4/debian/changelog	                        (rev 0)
+++ tags/rt2400-1.2.2+cvs20080623-4/debian/changelog	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,237 @@
+rt2400 (1.2.2+cvs20080623-4) unstable; urgency=low
+
+  * Fix compatibility with kernel versions 2.6.27-2.6.29
+  * Use proper function to free the net_device
+  * Update Standards-Version to 3.8.1:
+    - Add README.source
+  * Move to the new 'kernel' section
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 14 Apr 2009 01:15:54 +0100
+
+rt2400 (1.2.2+cvs20080623-3) unstable; urgency=high
+
+  * Fixed buffer overflow vulnerability in processing of ad-hoc probe
+    requests (CVE-2009-0282) (closes: bug#512999)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 28 Jan 2009 00:23:31 +0000
+
+rt2400 (1.2.2+cvs20080623-2) unstable; urgency=low
+
+  * Modified 000_if_name.diff to apply at -p1 (closes: bug#485258)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 23 Jun 2008 14:40:12 +0100
+
+rt2400 (1.2.2+cvs20080623-1) unstable; urgency=low
+
+  * New CVS snapshot
+    - Obsoletes 004_fix_mlme_queue_locking.diff
+  * Copied recommendations and suggestions from modules packages to
+    rt2400-source to make them more visible
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 23 Jun 2008 00:12:29 +0100
+
+rt2400 (1.2.2+cvs20070911-1) unstable; urgency=low
+
+  * New CVS snapshot
+    - Removes RaConfig2400 utility and rt2400 binary package
+  * Added suggestion of rutilt package as a replacement for rt2400
+  * Fixed some race conditions in processing of queued work, with help
+    from Bryan Batten (004_fix_mlme_queue_locking.diff)
+  * Added dependency of rt2400-source on bzip2 (closes: bug#448715)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 11 Nov 2007 23:57:45 +0000
+
+rt2400 (1.2.2+cvs20070219-3) unstable; urgency=low
+
+  * Workaround linux-libc-dev bug by including linux/if.h before
+    linux/wireless.h  (closes: bug#428996).
+  * patches/2.6.22.diff: fix the build of the module with 2.6.22+ kernels
+    (closes: bug#432532).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 15 Jul 2007 19:12:43 +0200
+
+rt2400 (1.2.2+cvs20070219-2) unstable; urgency=low
+
+  * Switch maintainer to "Debian Ralink packages maintainers".
+  * Move Ben Hutchings to uploaders, and add Romain Beauxis to uploaders.
+  * Use quilt for patch management.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon,  5 Mar 2007 23:34:53 +0100
+
+rt2400 (1.2.2+cvs20070219-1) unstable; urgency=low
+
+   * Switch Maintainer and Uploader.
+   * New CVS snaphost.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 20 Feb 2007 00:51:27 +0100
+
+rt2400 (1.2.2+cvs20061231-2) unstable; urgency=low
+
+  * Use bzip2 instead of gzip to compress the sources.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed,  3 Jan 2007 20:53:59 +0100
+
+rt2400 (1.2.2+cvs20061231-1) unstable; urgency=low
+
+  * New CVS version.
+    - Fix SSID handling with kernels >= 2.6.19 (closes: bug#405009).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 31 Dec 2006 18:29:13 +0100
+
+rt2400 (1.2.2+cvs20061210-1) unstable; urgency=low
+
+  * New CVS version. 
+    - Fix build with kernels >= 2.6.19 (closes: bug#401209).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 10 Dec 2006 15:05:08 +0100
+
+rt2400 (1.2.2+cvs20060620-4) unstable; urgency=low
+
+  * debian/rules: fix a bashims (closes: bug#385205). 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed, 30 Aug 2006 14:49:18 +0200
+
+rt2400 (1.2.2+cvs20060620-3) unstable; urgency=low
+
+  * Fixed a typo in the description. 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue,  1 Aug 2006 16:23:05 +0200
+
+rt2400 (1.2.2+cvs20060620-2) unstable; urgency=low
+
+  * Fix build with kernels >= 2.6.17 (closes: bug#379085).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 21 Jul 2006 12:10:52 +0200
+
+rt2400 (1.2.2+cvs20060620-1) unstable; urgency=low
+
+  * New CVS version.
+  * Bumped Standards-Version to 3.7.2 (no changes).
+  * rt2400: stop recommending rt2400-module (closes: bug#376904).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 11 Jul 2006 10:39:56 +0200
+
+rt2400 (1.2.2+cvs20060417-4) unstable; urgency=low
+
+  * Rename rt2400-_KVERS_ into rt2400-modules-_KVERS_.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 22 Apr 2006 20:17:52 +0200
+
+rt2400 (1.2.2+cvs20060417-3) unstable; urgency=low
+
+  * Added Ben Hutchings <ben at decadentplace.org.uk> to the Uploaders: field.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 20 Apr 2006 16:22:32 +0200
+
+rt2400 (1.2.2+cvs20060417-2) unstable; urgency=low
+
+  * Fix a typo in README.Debian. 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 20 Apr 2006 03:31:20 +0200
+
+rt2400 (1.2.2+cvs20060417-1) unstable; urgency=low
+
+  * New CVS version.
+  * Put a link to /usr/share/doc/rt2400-source/README.Debian into the
+    root of rt2400.tar.gz, as users are unable to look in /usr/share/doc/
+    by themselves.
+  * Add a menu item for RaConfig2400.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 17 Apr 2006 16:20:47 +0200
+
+rt2400 (1.2.2+cvs20051217-2) unstable; urgency=low
+
+  * I have received reports that the rt2400 driver is also working with an 
+    SMP kernel, so disable the error message when compiling on such a kernel.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 19 Dec 2005 21:36:39 +0100
+
+rt2400 (1.2.2+cvs20051217-1) unstable; urgency=low
+
+  * New CVS version.
+  * Only suggests gcc-3.3 and fails if it is not installed when building
+    the module against a 2.4 kernel.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 18 Dec 2005 00:12:48 +0100
+
+rt2400 (1.2.2+cvs20050730-6) unstable; urgency=low
+
+  * Really upload to unstable. 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed,  2 Nov 2005 11:19:34 +0100
+
+rt2400 (1.2.2+cvs20050730-5) experimental; urgency=low
+
+  * Upload to unstable. 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue,  1 Nov 2005 16:13:56 +0100
+
+rt2400 (1.2.2+cvs20050730-4) experimental; urgency=low
+
+  * Upload to experimental as unstable is semi-frozen. 
+  * Refuse to build the module on an SMP kernel.
+  * Only recommends linux-image-2.6.xx.
+  * Clarified the description of rt2400.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 31 Oct 2005 20:17:52 +0100
+
+rt2400 (1.2.2+cvs20050730-3) unstable; urgency=low
+ 
+  * It's seems RT2400STA.dat is only used by the configuration tool.
+    Move this file in this package, and delete the rt2400-base package
+    (closes: bug#325897)
+  * Changed the name of the interface directly in the sources to be
+    able to get rid of rt2400-base.
+  * Added a README.Debian in the module package to explain how to
+    change the name of the interface.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 16 Sep 2005 11:14:31 +0200
+
+rt2400 (1.2.2+cvs20050730-2) unstable; urgency=low
+
+  * C++ transition: build-depends on libqt3-mt-dev (>= 3.3.4-4)
+    (closes: bug#320507). 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 12 Aug 2005 00:03:00 +0200
+
+rt2400 (1.2.2+cvs20050730-1) unstable; urgency=low
+
+  * New CVS version corresponding to 1.2.2-b3.
+  * Fixed a bug in debian rules that was making the module unbuildable.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri,  5 Aug 2005 19:21:16 +0200
+
+rt2400 (1.2.2+cvs20050710-2) unstable; urgency=low
+
+  * Make the modules also depending on the kernel images which are using
+    the new kernel naming scheme.
+  * Only build modules with gcc-3.3 with 2.4 kernels.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon,  1 Aug 2005 01:57:33 +0200
+
+rt2400 (1.2.2+cvs20050710-1) unstable; urgency=low
+
+  * Upload from Debconf 5.
+  * New CVS version.
+  * Build modules ith gcc-3.3.
+  * Bumped Standards-Version to 3.6.2 (no changes).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 11 Jul 2005 10:44:27 +0300
+
+rt2400 (1.2.2+cvs20050618-1) unstable; urgency=low
+
+  * New CVS version. 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 18 Jun 2005 20:33:19 +0200
+
+rt2400 (1.2.2+cvs20050530-2) unstable; urgency=low
+
+  * Don't try to include README in the module package (closes: bug#312001). 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat,  4 Jun 2005 20:41:45 +0200
+
+rt2400 (1.2.2+cvs20050530-1) unstable; urgency=low
+
+  * Initial Release (closes: bug#285757).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 31 May 2005 07:23:11 +0200

Deleted: tags/rt2400-1.2.2+cvs20080623-4/debian/control
===================================================================
--- unstable/rt2400/debian/control	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt2400-1.2.2+cvs20080623-4/debian/control	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,27 +0,0 @@
-Source: rt2400
-Section: net
-Priority: extra
-Build-Depends: debhelper (>= 4.0), bzip2, quilt
-Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
-Uploaders: Aurelien Jarno <aurel32 at debian.org>, Ben Hutchings <ben at decadent.org.uk>, Romain Beauxis <toots at rastageeks.org>
-Standards-Version: 3.7.2
-Homepage: http://rt2x00.serialmonkey.com/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ralink/unstable/rt2400
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ralink/unstable/rt2400
-
-Package: rt2400-source
-Architecture: all
-Depends: debhelper (>= 4.0), module-assistant, bzip2
-Recommends: wireless-tools
-Suggests: rutilt
-Description: source for rt2400 wireless network driver
- This package provides source code for the rt2400 driver for Linux.
- This driver supports PCI and CardBus wireless network cards with the
- Ralink RT2400 or RT2401 chipset.  An alternate driver, rt2400pci, is
- available in the rt2x00-source package and in the Linux kernel from
- version 2.6.24.
- .
- In order to compile the driver you need the kernel sources (or
- the linux-headers for the linux-image packages from Debian). For
- compile instructions look into /usr/share/doc/rt2400-source/README.Debian
- or simply use the module-assistant utility.

Copied: tags/rt2400-1.2.2+cvs20080623-4/debian/control (from rev 171, unstable/rt2400/debian/control)
===================================================================
--- tags/rt2400-1.2.2+cvs20080623-4/debian/control	                        (rev 0)
+++ tags/rt2400-1.2.2+cvs20080623-4/debian/control	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,27 @@
+Source: rt2400
+Section: kernel
+Priority: extra
+Build-Depends: debhelper (>= 4.0), bzip2, quilt
+Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
+Uploaders: Aurelien Jarno <aurel32 at debian.org>, Ben Hutchings <ben at decadent.org.uk>, Romain Beauxis <toots at rastageeks.org>
+Standards-Version: 3.8.1
+Homepage: http://rt2x00.serialmonkey.com/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-ralink/unstable/rt2400
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ralink/unstable/rt2400
+
+Package: rt2400-source
+Architecture: all
+Depends: debhelper (>= 4.0), module-assistant, bzip2
+Recommends: wireless-tools
+Suggests: rutilt
+Description: source for rt2400 wireless network driver
+ This package provides source code for the rt2400 driver for Linux.
+ This driver supports PCI and CardBus wireless network cards with the
+ Ralink RT2400 or RT2401 chipset.  An alternate driver, rt2400pci, is
+ available in the rt2x00-source package and in the Linux kernel from
+ version 2.6.24.
+ .
+ In order to compile the driver you need the kernel sources (or
+ the linux-headers for the linux-image packages from Debian). For
+ compile instructions look into /usr/share/doc/rt2400-source/README.Debian
+ or simply use the module-assistant utility.

Deleted: tags/rt2400-1.2.2+cvs20080623-4/debian/control.modules.in
===================================================================
--- unstable/rt2400/debian/control.modules.in	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt2400-1.2.2+cvs20080623-4/debian/control.modules.in	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,18 +0,0 @@
-Source: rt2400
-Section: net
-Priority: extra
-Build-Depends: debhelper (>= 4.0.0)
-Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
-Standards-Version: 3.7.2
-Homepage: http://rt2x00.serialmonkey.com/
-
-Package: rt2400-modules-_KVERS_
-Architecture: any
-Recommends: linux-image-_KVERS_, wireless-tools
-Conflicts: rt2400-_KVERS_
-Suggests: rutilt
-Description: rt2400 wireless network driver
- This package contains the rt2400 driver for Linux _KVERS_.
- .
- This driver supports PCI and CardBus wireless network cards with the
- Ralink RT2400 or RT2401 chipset.

Copied: tags/rt2400-1.2.2+cvs20080623-4/debian/control.modules.in (from rev 171, unstable/rt2400/debian/control.modules.in)
===================================================================
--- tags/rt2400-1.2.2+cvs20080623-4/debian/control.modules.in	                        (rev 0)
+++ tags/rt2400-1.2.2+cvs20080623-4/debian/control.modules.in	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,18 @@
+Source: rt2400
+Section: kernel
+Priority: extra
+Build-Depends: debhelper (>= 4.0.0)
+Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
+Standards-Version: 3.8.1
+Homepage: http://rt2x00.serialmonkey.com/
+
+Package: rt2400-modules-_KVERS_
+Architecture: any
+Recommends: linux-image-_KVERS_, wireless-tools
+Conflicts: rt2400-_KVERS_
+Suggests: rutilt
+Description: rt2400 wireless network driver
+ This package contains the rt2400 driver for Linux _KVERS_.
+ .
+ This driver supports PCI and CardBus wireless network cards with the
+ Ralink RT2400 or RT2401 chipset.

Deleted: tags/rt2400-1.2.2+cvs20080623-4/debian/patches/000_if_name.diff
===================================================================
--- unstable/rt2400/debian/patches/000_if_name.diff	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt2400-1.2.2+cvs20080623-4/debian/patches/000_if_name.diff	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,31 +0,0 @@
---- rt2400.orig/Module/rtmp_main.c
-+++ rt2400/Module/rtmp_main.c
-@@ -64,7 +64,7 @@
- #endif
- 
- MODULE_PARM_DESC(debug, "Enable level: accepted values: 1 to switch debug on, 0 to switch debug off.");
--MODULE_PARM_DESC(ifname, "Network device name (default ra%d)");
-+MODULE_PARM_DESC(ifname, "Network device name (default eth%d)");
- #else
- int	debug = 0;	/* Default is off. */
- module_param(debug, int, 0);
-@@ -72,7 +72,7 @@
- 
- static char *ifname = NULL;
- module_param(ifname, charp, 0);
--MODULE_PARM_DESC(ifname, "Network device name (default ra%d)");
-+MODULE_PARM_DESC(ifname, "Network device name (default eth%d)");
- #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) */
- 
- // The driver version information
-@@ -284,9 +284,8 @@
- 	net_dev->set_mac_address = rt2400_set_mac_address;
- 
- 	// register_netdev() will call dev_alloc_name() for us
--	// TODO: remove the following line to keep the default "eth%d" (see above)
-         if (ifname == NULL)
--             strcpy(net_dev->name, "ra%d");
-+             strcpy(net_dev->name, "eth%d");
-         else
-              strncpy(net_dev->name, ifname, IFNAMSIZ);
- 

Copied: tags/rt2400-1.2.2+cvs20080623-4/debian/patches/000_if_name.diff (from rev 157, unstable/rt2400/debian/patches/000_if_name.diff)
===================================================================
--- tags/rt2400-1.2.2+cvs20080623-4/debian/patches/000_if_name.diff	                        (rev 0)
+++ tags/rt2400-1.2.2+cvs20080623-4/debian/patches/000_if_name.diff	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,34 @@
+Linux network devices should be named generically, not depending on the
+manufacturer.
+
+--- rt2400.orig/Module/rtmp_main.c
++++ rt2400/Module/rtmp_main.c
+@@ -64,7 +64,7 @@
+ #endif
+ 
+ MODULE_PARM_DESC(debug, "Enable level: accepted values: 1 to switch debug on, 0 to switch debug off.");
+-MODULE_PARM_DESC(ifname, "Network device name (default ra%d)");
++MODULE_PARM_DESC(ifname, "Network device name (default eth%d)");
+ #else
+ int	debug = 0;	/* Default is off. */
+ module_param(debug, int, 0);
+@@ -72,7 +72,7 @@
+ 
+ static char *ifname = NULL;
+ module_param(ifname, charp, 0);
+-MODULE_PARM_DESC(ifname, "Network device name (default ra%d)");
++MODULE_PARM_DESC(ifname, "Network device name (default eth%d)");
+ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) */
+ 
+ // The driver version information
+@@ -284,9 +284,8 @@
+ 	net_dev->set_mac_address = rt2400_set_mac_address;
+ 
+ 	// register_netdev() will call dev_alloc_name() for us
+-	// TODO: remove the following line to keep the default "eth%d" (see above)
+         if (ifname == NULL)
+-             strcpy(net_dev->name, "ra%d");
++             strcpy(net_dev->name, "eth%d");
+         else
+              strncpy(net_dev->name, ifname, IFNAMSIZ);
+ 

Copied: tags/rt2400-1.2.2+cvs20080623-4/debian/patches/002_no_config_file.diff (from rev 157, unstable/rt2400/debian/patches/002_no_config_file.diff)
===================================================================
--- tags/rt2400-1.2.2+cvs20080623-4/debian/patches/002_no_config_file.diff	                        (rev 0)
+++ tags/rt2400-1.2.2+cvs20080623-4/debian/patches/002_no_config_file.diff	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,21 @@
+Disable reading parameters from file; this was deprecated and the
+implementation fails to build for current kernels.
+
+--- rt2400-1.2.2+cvs20080623.orig/Module/rtmp_init.c
++++ rt2400-1.2.2+cvs20080623/Module/rtmp_init.c
+@@ -1069,6 +1069,7 @@
+ VOID RTMPReadParametersFromFile(
+ 	IN	PRTMP_ADAPTER pAd)
+ {
++#if 0
+ 	RTMP_PROFILE_SETTING	profile;
+ 	PUCHAR					src;
+ 	struct file				*srcf;
+@@ -1147,6 +1148,7 @@
+ 	set_fs(orgfs);
+ 	current->fsuid=orgfsuid;
+ 	current->fsgid=orgfsgid;
++#endif // 0
+ }
+ 
+ /*

Copied: tags/rt2400-1.2.2+cvs20080623-4/debian/patches/003_use_netdev_functions.diff (from rev 157, unstable/rt2400/debian/patches/003_use_netdev_functions.diff)
===================================================================
--- tags/rt2400-1.2.2+cvs20080623-4/debian/patches/003_use_netdev_functions.diff	                        (rev 0)
+++ tags/rt2400-1.2.2+cvs20080623-4/debian/patches/003_use_netdev_functions.diff	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,13 @@
+Use proper function to free the net_device.
+
+--- rt2400-1.2.2+cvs20080623.orig/Module/rtmp_main.c
++++ rt2400-1.2.2+cvs20080623/Module/rtmp_main.c
+@@ -879,7 +879,7 @@
+         pci_disable_device(pPci_Dev);
+ 
+ 	// Free pre-allocated net_device memory
+-	kfree(net_dev);
++	free_netdev(net_dev);
+ }
+ 
+ //

Deleted: tags/rt2400-1.2.2+cvs20080623-4/debian/patches/series
===================================================================
--- unstable/rt2400/debian/patches/series	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt2400-1.2.2+cvs20080623-4/debian/patches/series	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,2 +0,0 @@
-000_if_name.diff
-001_fix_probe_request_overflow.diff

Copied: tags/rt2400-1.2.2+cvs20080623-4/debian/patches/series (from rev 155, unstable/rt2400/debian/patches/series)
===================================================================
--- tags/rt2400-1.2.2+cvs20080623-4/debian/patches/series	                        (rev 0)
+++ tags/rt2400-1.2.2+cvs20080623-4/debian/patches/series	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,4 @@
+000_if_name.diff
+001_fix_probe_request_overflow.diff
+002_no_config_file.diff
+003_use_netdev_functions.diff


Property changes on: tags/rt2500-1:1.1.0-b4+cvs20080623-4
___________________________________________________________________
Added: mergeWithUpstream
   + 1
Added: svn:mergeinfo
   + 

Deleted: tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/NEWS
===================================================================
--- unstable/rt2500/debian/NEWS	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/NEWS	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,7 +0,0 @@
-rt2500 (1:1.1.0+b4-cvs20070924-1) unstable; urgency=low
-
-  * The RaConfig2500 configuration program, previously included in the
-    rt2500 binary package, is no longer supported upstream.  There is a
-    replacement program called rutilt in the package rutilt.
-
- -- Ben Hutchings <ben at decadent.org.uk>  Mon, 22 Oct 2007 01:58:05 +0100

Copied: tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/NEWS (from rev 179, unstable/rt2500/debian/NEWS)
===================================================================
--- tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/NEWS	                        (rev 0)
+++ tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/NEWS	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,18 @@
+rt2500 (1:1.1.0-b4+cvs20080623-4) unstable; urgency=low
+
+  * rt2500 is no longer supported by Ralink or the community around
+    rt2x00.serialmonkey.net.  We cannot provide much support for it, and
+    recommend that you use the rt2500pci driver included with the Linux
+    kernel.
+  * If rt2500 works (or used to work) with your card but rt2500pci does
+    not, please report a bug against the linux-2.6 package.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 14 Apr 2009 02:09:07 +0100
+
+rt2500 (1:1.1.0+b4-cvs20070924-1) unstable; urgency=low
+
+  * The RaConfig2500 configuration program, previously included in the
+    rt2500 binary package, is no longer supported upstream.  There is a
+    replacement program called rutilt in the package rutilt.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 22 Oct 2007 01:58:05 +0100

Copied: tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/README.source (from rev 169, unstable/rt2500/debian/README.source)
===================================================================
--- tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/README.source	                        (rev 0)
+++ tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/README.source	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,4 @@
+Changes to upstream source are organised as a quilt patch series.
+
+Run debian/rules patch to apply all patches and debian/rules unpatch
+to remove them.  See the quilt documentation for more information.

Deleted: tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/changelog
===================================================================
--- unstable/rt2500/debian/changelog	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/changelog	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,259 +0,0 @@
-rt2500 (1:1.1.0-b4+cvs20080623-3) unstable; urgency=high
-
-  * Fixed buffer overflow vulnerability in processing of ad-hoc probe
-    requests (CVE-2009-0282) (closes: bug#513000)
-
- -- Ben Hutchings <ben at decadent.org.uk>  Wed, 28 Jan 2009 00:33:41 +0000
-
-rt2500 (1:1.1.0-b4+cvs20080623-2) unstable; urgency=low
-
-  * Revised 005_fix_error_rate_vars.diff so that it does not remove
-    updates to channel quality (closes: bug#496900)
-
- -- Ben Hutchings <ben at decadent.org.uk>  Tue, 02 Sep 2008 23:04:35 +0100
-
-rt2500 (1:1.1.0-b4+cvs20080623-1) unstable; urgency=low
-
-  * New CVS snapshot
-    - Obsoletes 004_fix_mlme_queue_locking.diff, 006_2.6.24.diff
-  * Modified 000_if_name.diff to apply at -p1 (closes: bug#484959)
-
- -- Ben Hutchings <ben at decadent.org.uk>  Mon, 23 Jun 2008 00:39:34 +0100
-
-rt2500 (1:1.1.0-b4+cvs20070924-3) unstable; urgency=low
-
-  * Copied recommendations and suggestions from modules packages to
-    rt2500-source to make them more visible
-  * Removed use of SET_MODULE_OWNER, a no-op in Linux 2.6.x and removed
-    in 2.6.24 (006_2.6.24.diff) (closes: bug#463869)
-
- -- Ben Hutchings <ben at decadent.org.uk>  Fri, 08 Feb 2008 00:51:25 +0000
-
-rt2500 (1:1.1.0-b4+cvs20070924-2) unstable; urgency=low
-
-  * Added dependency of rt2500-source on bzip2 (closes: bug#448717)
-
- -- Ben Hutchings <ben at decadent.org.uk>  Sun, 11 Nov 2007 23:58:24 +0000
-
-rt2500 (1:1.1.0-b4+cvs20070924-1) unstable; urgency=low
-
-  * New CVS snapshot
-    - Removes RaConfig2500 utility and rt2500 binary package
-  * Added suggestion of rutilt package as a replacement for rt2500
-  * Fixed some race conditions in processing of queued work, with help
-    from Bryan Batten (004_fix_mlme_queue_locking.diff)
-  * Fixed sharing of error rate variables between interfaces
-    (005_fix_error_rate_vars.diff)
-
- -- Ben Hutchings <ben at decadent.org.uk>  Mon, 22 Oct 2007 01:58:22 +0100
-
-rt2500 (1:1.1.0-b4-4) unstable; urgency=low
-
-  * Workaround linux-libc-dev bug by including linux/if.h before
-    linux/wireless.h  (closes: bug#429019).
-  * patches/2.6.22: fix the build of the module with 2.6.22+ kernels
-    (closes: bug#432358).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sun, 15 Jul 2007 21:30:43 +0200
-
-rt2500 (1:1.1.0-b4-3) unstable; urgency=low
-
-  * Fixed 2.6.19.patch (Closes: #399051)
-
- -- Romain Beauxis <toots at rastageeks.org>  Thu, 15 Mar 2007 14:26:43 +0100
-
-rt2500 (1:1.1.0-b4-2) unstable; urgency=low
-
-  * patches/2.6.19.diff: add a missing part preventing the module
-    to be built on 2.6.19+ kernels (closes: bug#413724).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue,  6 Mar 2007 20:55:40 +0100
-
-rt2500 (1:1.1.0-b4-1) unstable; urgency=low
-
-  * Switch back to 1.1.0-b4 + backported patches (closes: bug#411703, 
-    bug#413158).
-  * Switch maintainer to "Debian Ralink packages maintainers".
-  * Move Ben Hutchings to uploaders, and add Romain Beauxis to uploaders.
-  * Use quilt for patch management.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue,  6 Mar 2007 00:53:59 +0100
-
-rt2500 (1.1.0+cvs20070219-1) unstable; urgency=low
-
-  * Switch Maintainer and Uploader.
-  * New CVS snaphost.
-    - Fix build on >= 2.6.20-rc5 kernels (closes: bug#406825).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 19 Feb 2007 01:50:17 +0100
-
-rt2500 (1.1.0+cvs20061231-2) unstable; urgency=low
-
-  * Use bzip2 instead of gzip to compress the sources. 
-
- -- Aurelien Jarno <aurel32 at debian.org>  Wed,  3 Jan 2007 20:58:09 +0100
-
-rt2500 (1.1.0+cvs20061231-1) unstable; urgency=low
-
-  * New CVS snaphost.
-    - Fix SSID handling with kernels >= 2.6.19.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sun, 31 Dec 2006 18:28:26 +0100
-
-rt2500 (1.1.0+cvs20061210-1) unstable; urgency=low
-
-  * New CVS snapshot.
-     - Fix build with kernels >= 2.6.19.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sun, 10 Dec 2006 15:30:22 +0100
-
-rt2500 (1.1.0+cvs20060620-3) unstable; urgency=low
-
-  * debian/rules: fix a bashism (closes: bug#385207).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Wed, 30 Aug 2006 14:56:48 +0200
-
-rt2500 (1.1.0+cvs20060620-2) unstable; urgency=low
-
-  * Fixed a typo in the description. 
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue,  1 Aug 2006 16:28:49 +0200
-
-rt2500 (1.1.0+cvs20060620-1) unstable; urgency=low
-
-  * New CVS snapshot (closes: bug#376319). 
-  * Bumped Standard-Versions to 3.7.2 (no changes).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 11 Jul 2006 09:39:27 +0200
-
-rt2500 (1.1.0+cvs20060420-3) unstable; urgency=low
-
-  * Fixed a bug preventing the interface to be detected if its number is
-    greater than 0.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Thu, 27 Apr 2006 21:53:57 +0200
-
-rt2500 (1.1.0+cvs20060420-2) unstable; urgency=low
-
-  * Rename rt2500-_KVERS_ into rt2500-modules-_KVERS_.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sat, 22 Apr 2006 18:56:26 +0200
-
-rt2500 (1.1.0+cvs20060420-1) unstable; urgency=low
-
-  * New CVS version that should work on SMP machines (closes: bug#363640).
-  * Added Ben Hutchings <ben at decadentplace.org.uk> to the Uploaders: field.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Thu, 20 Apr 2006 12:26:35 +0200
-
-rt2500 (1.1.0+cvs20060417-2) unstable; urgency=low
-
-  * Fix a typo in README.Debian (closes: bug#363563).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Thu, 20 Apr 2006 03:28:32 +0200
-
-rt2500 (1.1.0+cvs20060417-1) unstable; urgency=low
-
-  * New CVS version.
-  * Put a link to /usr/share/doc/rt2500-source/README.Debian into the 
-    root of rt2500.tar.gz, as users are unable to look in /usr/share/doc/
-    by themselves (closes: bug#350500).
-  * Add a menu item for RaConfig2500 (closes: bug#360779).
-  * Fixed a typo in RaConfig2500. Thanks to Peter Crosbie Stevenson
-    <stevepe at earlham.edu> (closes: bug#355073).
-  * Fixed some text fields that where cutted-off in RaConfig2500. Thanks to 
-    Peter Stevenson (closes: bug#354795).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 30 Jan 2006 01:12:03 +0100
-
-rt2500 (1.1.0+cvs20051217-1) unstable; urgency=low
-
-  * New CVS version:
-    - Add support for injection of raw packets (closes: bug#339673).
-  * Only suggests gcc-3.3 and fails if it is not installed when building
-    the module against a 2.4 kernel (closes: bug#341655).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sat, 17 Dec 2005 23:38:32 +0100
-
-rt2500 (1.1.0+cvs20050819-4) unstable; urgency=low
-
-  * Move to unstable. 
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue,  1 Nov 2005 15:32:06 +0100
-
-rt2500 (1.1.0+cvs20050819-3) experimental; urgency=low
-
-  * Upload to experimental as unstable is semi-frozen.
-  * Refuse to build the module on SMP kernel.
-  * Only recommends linux-image-2.6.xx.
-  * Clarified the description of rt2500. 
-
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 31 Oct 2005 19:59:19 +0100
-
-rt2500 (1.1.0+cvs20050819-2) unstable; urgency=low
-
-  * It's seems RT2500STA.dat is only used by the configuration tool.
-    Move this file in this package, and delete the rt2500-base package
-    (closes: bug#325897).
-  * Changed the name of the interface directly in the sources to be
-    able to get rid of rt2500-base.
-  * Added a README.Debian in the module package to explain how to
-    change the name of the interface.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Wed, 31 Aug 2005 23:03:27 +0200
-
-rt2500 (1.1.0+cvs20050819-1) unstable; urgency=low
-
-  * New CVS version.
-  * This version now builds on powerpc (closes: #321822), but I have no
-    way to verify it works on this architecture.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Wed, 31 Aug 2005 22:41:47 +0200
-
-rt2500 (1.1.0+cvs20050710-4) unstable; urgency=low
-
-  * C++ transition: build-depends on libqt3-mt-dev (>= 3.3.4-4)
-    (closes: bug#320234). 
-
- -- Aurelien Jarno <aurel32 at debian.org>  Fri, 12 Aug 2005 00:04:06 +0200
-
-rt2500 (1.1.0+cvs20050710-3) unstable; urgency=low
-
-  * Oops fixed a typo in debian/control.modules.in. 
-
- -- Aurelien Jarno <aurel32 at debian.org>  Mon,  1 Aug 2005 01:57:18 +0200
-
-rt2500 (1.1.0+cvs20050710-2) unstable; urgency=low
-
-  * Make the modules also depending on the kernel images which are using
-    the new kernel naming scheme (closes: bug#320361).
-  * Only build modules with gcc-3.3 on a 2.4 kernel.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Mon,  1 Aug 2005 01:38:07 +0200
-
-rt2500 (1.1.0+cvs20050710-1) unstable; urgency=low
-
-  * Upload from Debconf 5.
-  * New CVS version.
-  * Build modules with gcc-3.3.
-  * Bumped Standard-Versions to 3.6.2 (no changes).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 11 Jul 2005 10:44:57 +0300
-
-rt2500 (1.1.0+cvs20050530-2) unstable; urgency=low
-
-  * Build-Depends on debhelper (closes: bug#311575). 
-
- -- Aurelien Jarno <aurel32 at debian.org>  Thu,  2 Jun 2005 08:22:33 +0200
-
-rt2500 (1.1.0+cvs20050530-1) unstable; urgency=low
-
-  * New CVS version.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 31 May 2005 07:16:46 +0200
-
-rt2500 (1.1.0+cvs20050528-1) unstable; urgency=low
-
-  * Initial Release (closes: bug#285756).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sun, 29 May 2005 19:03:04 +0200

Copied: tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/changelog (from rev 177, unstable/rt2500/debian/changelog)
===================================================================
--- tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/changelog	                        (rev 0)
+++ tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/changelog	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,269 @@
+rt2500 (1:1.1.0-b4+cvs20080623-4) unstable; urgency=low
+
+  * Fix compatibility with kernel versions 2.6.27-2.6.29 (closes: bug#509547)
+  * Use proper function to free the net_device
+  * Update Standards-Version to 3.8.1:
+    - Add README.source
+  * Move to the new 'kernel' section
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 14 Apr 2009 01:16:08 +0100
+
+rt2500 (1:1.1.0-b4+cvs20080623-3) unstable; urgency=high
+
+  * Fixed buffer overflow vulnerability in processing of ad-hoc probe
+    requests (CVE-2009-0282) (closes: bug#513000)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 28 Jan 2009 00:33:41 +0000
+
+rt2500 (1:1.1.0-b4+cvs20080623-2) unstable; urgency=low
+
+  * Revised 005_fix_error_rate_vars.diff so that it does not remove
+    updates to channel quality (closes: bug#496900)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 02 Sep 2008 23:04:35 +0100
+
+rt2500 (1:1.1.0-b4+cvs20080623-1) unstable; urgency=low
+
+  * New CVS snapshot
+    - Obsoletes 004_fix_mlme_queue_locking.diff, 006_2.6.24.diff
+  * Modified 000_if_name.diff to apply at -p1 (closes: bug#484959)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 23 Jun 2008 00:39:34 +0100
+
+rt2500 (1:1.1.0-b4+cvs20070924-3) unstable; urgency=low
+
+  * Copied recommendations and suggestions from modules packages to
+    rt2500-source to make them more visible
+  * Removed use of SET_MODULE_OWNER, a no-op in Linux 2.6.x and removed
+    in 2.6.24 (006_2.6.24.diff) (closes: bug#463869)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Fri, 08 Feb 2008 00:51:25 +0000
+
+rt2500 (1:1.1.0-b4+cvs20070924-2) unstable; urgency=low
+
+  * Added dependency of rt2500-source on bzip2 (closes: bug#448717)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 11 Nov 2007 23:58:24 +0000
+
+rt2500 (1:1.1.0-b4+cvs20070924-1) unstable; urgency=low
+
+  * New CVS snapshot
+    - Removes RaConfig2500 utility and rt2500 binary package
+  * Added suggestion of rutilt package as a replacement for rt2500
+  * Fixed some race conditions in processing of queued work, with help
+    from Bryan Batten (004_fix_mlme_queue_locking.diff)
+  * Fixed sharing of error rate variables between interfaces
+    (005_fix_error_rate_vars.diff)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 22 Oct 2007 01:58:22 +0100
+
+rt2500 (1:1.1.0-b4-4) unstable; urgency=low
+
+  * Workaround linux-libc-dev bug by including linux/if.h before
+    linux/wireless.h  (closes: bug#429019).
+  * patches/2.6.22: fix the build of the module with 2.6.22+ kernels
+    (closes: bug#432358).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 15 Jul 2007 21:30:43 +0200
+
+rt2500 (1:1.1.0-b4-3) unstable; urgency=low
+
+  * Fixed 2.6.19.patch (Closes: #399051)
+
+ -- Romain Beauxis <toots at rastageeks.org>  Thu, 15 Mar 2007 14:26:43 +0100
+
+rt2500 (1:1.1.0-b4-2) unstable; urgency=low
+
+  * patches/2.6.19.diff: add a missing part preventing the module
+    to be built on 2.6.19+ kernels (closes: bug#413724).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue,  6 Mar 2007 20:55:40 +0100
+
+rt2500 (1:1.1.0-b4-1) unstable; urgency=low
+
+  * Switch back to 1.1.0-b4 + backported patches (closes: bug#411703, 
+    bug#413158).
+  * Switch maintainer to "Debian Ralink packages maintainers".
+  * Move Ben Hutchings to uploaders, and add Romain Beauxis to uploaders.
+  * Use quilt for patch management.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue,  6 Mar 2007 00:53:59 +0100
+
+rt2500 (1.1.0+cvs20070219-1) unstable; urgency=low
+
+  * Switch Maintainer and Uploader.
+  * New CVS snaphost.
+    - Fix build on >= 2.6.20-rc5 kernels (closes: bug#406825).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 19 Feb 2007 01:50:17 +0100
+
+rt2500 (1.1.0+cvs20061231-2) unstable; urgency=low
+
+  * Use bzip2 instead of gzip to compress the sources. 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed,  3 Jan 2007 20:58:09 +0100
+
+rt2500 (1.1.0+cvs20061231-1) unstable; urgency=low
+
+  * New CVS snaphost.
+    - Fix SSID handling with kernels >= 2.6.19.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 31 Dec 2006 18:28:26 +0100
+
+rt2500 (1.1.0+cvs20061210-1) unstable; urgency=low
+
+  * New CVS snapshot.
+     - Fix build with kernels >= 2.6.19.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 10 Dec 2006 15:30:22 +0100
+
+rt2500 (1.1.0+cvs20060620-3) unstable; urgency=low
+
+  * debian/rules: fix a bashism (closes: bug#385207).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed, 30 Aug 2006 14:56:48 +0200
+
+rt2500 (1.1.0+cvs20060620-2) unstable; urgency=low
+
+  * Fixed a typo in the description. 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue,  1 Aug 2006 16:28:49 +0200
+
+rt2500 (1.1.0+cvs20060620-1) unstable; urgency=low
+
+  * New CVS snapshot (closes: bug#376319). 
+  * Bumped Standard-Versions to 3.7.2 (no changes).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 11 Jul 2006 09:39:27 +0200
+
+rt2500 (1.1.0+cvs20060420-3) unstable; urgency=low
+
+  * Fixed a bug preventing the interface to be detected if its number is
+    greater than 0.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 27 Apr 2006 21:53:57 +0200
+
+rt2500 (1.1.0+cvs20060420-2) unstable; urgency=low
+
+  * Rename rt2500-_KVERS_ into rt2500-modules-_KVERS_.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 22 Apr 2006 18:56:26 +0200
+
+rt2500 (1.1.0+cvs20060420-1) unstable; urgency=low
+
+  * New CVS version that should work on SMP machines (closes: bug#363640).
+  * Added Ben Hutchings <ben at decadentplace.org.uk> to the Uploaders: field.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 20 Apr 2006 12:26:35 +0200
+
+rt2500 (1.1.0+cvs20060417-2) unstable; urgency=low
+
+  * Fix a typo in README.Debian (closes: bug#363563).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 20 Apr 2006 03:28:32 +0200
+
+rt2500 (1.1.0+cvs20060417-1) unstable; urgency=low
+
+  * New CVS version.
+  * Put a link to /usr/share/doc/rt2500-source/README.Debian into the 
+    root of rt2500.tar.gz, as users are unable to look in /usr/share/doc/
+    by themselves (closes: bug#350500).
+  * Add a menu item for RaConfig2500 (closes: bug#360779).
+  * Fixed a typo in RaConfig2500. Thanks to Peter Crosbie Stevenson
+    <stevepe at earlham.edu> (closes: bug#355073).
+  * Fixed some text fields that where cutted-off in RaConfig2500. Thanks to 
+    Peter Stevenson (closes: bug#354795).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 30 Jan 2006 01:12:03 +0100
+
+rt2500 (1.1.0+cvs20051217-1) unstable; urgency=low
+
+  * New CVS version:
+    - Add support for injection of raw packets (closes: bug#339673).
+  * Only suggests gcc-3.3 and fails if it is not installed when building
+    the module against a 2.4 kernel (closes: bug#341655).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 17 Dec 2005 23:38:32 +0100
+
+rt2500 (1.1.0+cvs20050819-4) unstable; urgency=low
+
+  * Move to unstable. 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue,  1 Nov 2005 15:32:06 +0100
+
+rt2500 (1.1.0+cvs20050819-3) experimental; urgency=low
+
+  * Upload to experimental as unstable is semi-frozen.
+  * Refuse to build the module on SMP kernel.
+  * Only recommends linux-image-2.6.xx.
+  * Clarified the description of rt2500. 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 31 Oct 2005 19:59:19 +0100
+
+rt2500 (1.1.0+cvs20050819-2) unstable; urgency=low
+
+  * It's seems RT2500STA.dat is only used by the configuration tool.
+    Move this file in this package, and delete the rt2500-base package
+    (closes: bug#325897).
+  * Changed the name of the interface directly in the sources to be
+    able to get rid of rt2500-base.
+  * Added a README.Debian in the module package to explain how to
+    change the name of the interface.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed, 31 Aug 2005 23:03:27 +0200
+
+rt2500 (1.1.0+cvs20050819-1) unstable; urgency=low
+
+  * New CVS version.
+  * This version now builds on powerpc (closes: #321822), but I have no
+    way to verify it works on this architecture.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed, 31 Aug 2005 22:41:47 +0200
+
+rt2500 (1.1.0+cvs20050710-4) unstable; urgency=low
+
+  * C++ transition: build-depends on libqt3-mt-dev (>= 3.3.4-4)
+    (closes: bug#320234). 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 12 Aug 2005 00:04:06 +0200
+
+rt2500 (1.1.0+cvs20050710-3) unstable; urgency=low
+
+  * Oops fixed a typo in debian/control.modules.in. 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon,  1 Aug 2005 01:57:18 +0200
+
+rt2500 (1.1.0+cvs20050710-2) unstable; urgency=low
+
+  * Make the modules also depending on the kernel images which are using
+    the new kernel naming scheme (closes: bug#320361).
+  * Only build modules with gcc-3.3 on a 2.4 kernel.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon,  1 Aug 2005 01:38:07 +0200
+
+rt2500 (1.1.0+cvs20050710-1) unstable; urgency=low
+
+  * Upload from Debconf 5.
+  * New CVS version.
+  * Build modules with gcc-3.3.
+  * Bumped Standard-Versions to 3.6.2 (no changes).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 11 Jul 2005 10:44:57 +0300
+
+rt2500 (1.1.0+cvs20050530-2) unstable; urgency=low
+
+  * Build-Depends on debhelper (closes: bug#311575). 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu,  2 Jun 2005 08:22:33 +0200
+
+rt2500 (1.1.0+cvs20050530-1) unstable; urgency=low
+
+  * New CVS version.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 31 May 2005 07:16:46 +0200
+
+rt2500 (1.1.0+cvs20050528-1) unstable; urgency=low
+
+  * Initial Release (closes: bug#285756).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 29 May 2005 19:03:04 +0200

Deleted: tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/control
===================================================================
--- unstable/rt2500/debian/control	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/control	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,27 +0,0 @@
-Source: rt2500
-Section: net
-Priority: extra
-Build-Depends: debhelper (>= 4.0), bzip2, quilt
-Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
-Uploaders: Aurelien Jarno <aurel32 at debian.org>, Ben Hutchings <ben at decadent.org.uk>, Romain Beauxis <toots at rastageeks.org>
-Standards-Version: 3.7.2
-Homepage: http://rt2x00.serialmonkey.com/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ralink/unstable/rt2500
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ralink/unstable/rt2500
-
-Package: rt2500-source
-Architecture: all
-Depends: debhelper (>= 4.0), module-assistant, bzip2
-Recommends: wireless-tools
-Suggests: rutilt
-Description: source for rt2500 wireless network driver
- This package provides source code for the rt2500 driver for Linux.
- This driver supports PCI and CardBus wireless network cards with the
- Ralink RT2500 or RT5200 chipset.  An alternate driver, rt2500pci, is
- available in the rt2x00-source package and in the Linux kernel from
- version 2.6.24.
- .
- In order to compile the driver you need the kernel sources (or
- the linux-headers for the linux-image packages from Debian). For
- compile instructions look into /usr/share/doc/rt2500-source/README.Debian
- or simply use the module-assistant utility.

Copied: tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/control (from rev 171, unstable/rt2500/debian/control)
===================================================================
--- tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/control	                        (rev 0)
+++ tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/control	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,27 @@
+Source: rt2500
+Section: kernel
+Priority: extra
+Build-Depends: debhelper (>= 4.0), bzip2, quilt
+Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
+Uploaders: Aurelien Jarno <aurel32 at debian.org>, Ben Hutchings <ben at decadent.org.uk>, Romain Beauxis <toots at rastageeks.org>
+Standards-Version: 3.8.1
+Homepage: http://rt2x00.serialmonkey.com/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-ralink/unstable/rt2500
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ralink/unstable/rt2500
+
+Package: rt2500-source
+Architecture: all
+Depends: debhelper (>= 4.0), module-assistant, bzip2
+Recommends: wireless-tools
+Suggests: rutilt
+Description: source for rt2500 wireless network driver
+ This package provides source code for the rt2500 driver for Linux.
+ This driver supports PCI and CardBus wireless network cards with the
+ Ralink RT2500 or RT5200 chipset.  An alternate driver, rt2500pci, is
+ available in the rt2x00-source package and in the Linux kernel from
+ version 2.6.24.
+ .
+ In order to compile the driver you need the kernel sources (or
+ the linux-headers for the linux-image packages from Debian). For
+ compile instructions look into /usr/share/doc/rt2500-source/README.Debian
+ or simply use the module-assistant utility.

Deleted: tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/control.modules.in
===================================================================
--- unstable/rt2500/debian/control.modules.in	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/control.modules.in	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,18 +0,0 @@
-Source: rt2500
-Section: net
-Priority: extra
-Build-Depends: debhelper (>= 4.0.0)
-Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
-Standards-Version: 3.7.2
-Homepage: http://rt2x00.serialmonkey.com/
-
-Package: rt2500-modules-_KVERS_
-Conflicts: rt2500-_KVERS_
-Architecture: any
-Recommends: linux-image-_KVERS_, wireless-tools
-Suggests: rutilt
-Description: rt2500 wireless network driver
- This package contains the rt2500 driver for Linux _KVERS_.
- .
- This driver supports PCI and CardBus wireless network cards with the
- Ralink RT2500 or RT5200 chipset.

Copied: tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/control.modules.in (from rev 171, unstable/rt2500/debian/control.modules.in)
===================================================================
--- tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/control.modules.in	                        (rev 0)
+++ tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/control.modules.in	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,18 @@
+Source: rt2500
+Section: kernel
+Priority: extra
+Build-Depends: debhelper (>= 4.0.0)
+Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
+Standards-Version: 3.8.1
+Homepage: http://rt2x00.serialmonkey.com/
+
+Package: rt2500-modules-_KVERS_
+Conflicts: rt2500-_KVERS_
+Architecture: any
+Recommends: linux-image-_KVERS_, wireless-tools
+Suggests: rutilt
+Description: rt2500 wireless network driver
+ This package contains the rt2500 driver for Linux _KVERS_.
+ .
+ This driver supports PCI and CardBus wireless network cards with the
+ Ralink RT2500 or RT5200 chipset.

Deleted: tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/000_if_name.diff
===================================================================
--- unstable/rt2500/debian/patches/000_if_name.diff	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/000_if_name.diff	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,31 +0,0 @@
---- rt2500.orig/Module/rtmp_main.c
-+++ rt2500/Module/rtmp_main.c
-@@ -58,7 +58,7 @@
- 
- static char *ifname = NULL ;
- MODULE_PARM(ifname, "s");
--MODULE_PARM_DESC(ifname, "Network device name (default ra%d)");
-+MODULE_PARM_DESC(ifname, "Network device name (default eth%d)");
- #else
- static int debug = 0;	/* Default is off. */
- module_param(debug, int, 0);
-@@ -66,7 +66,7 @@
- 
- static char *ifname = NULL ;
- module_param(ifname, charp, 0);
--MODULE_PARM_DESC(ifname, "Network device name (default ra%d)");
-+MODULE_PARM_DESC(ifname, "Network device name (default eth%d)");
- #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) */
- 
- // Following information will be show when you run 'modinfo'
-@@ -315,9 +315,8 @@
- 
- 
-     // register_netdev() will call dev_alloc_name() for us
--    // TODO: Remove the following line to keep the default eth%d name
-     if (ifname == NULL)
--       strcpy(net_dev->name, "ra%d");
-+       strcpy(net_dev->name, "eth%d");
-     else
-        strncpy(net_dev->name, ifname, IFNAMSIZ);
- 

Copied: tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/000_if_name.diff (from rev 161, unstable/rt2500/debian/patches/000_if_name.diff)
===================================================================
--- tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/000_if_name.diff	                        (rev 0)
+++ tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/000_if_name.diff	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,34 @@
+Linux network devices should be named generically, not depending on the
+manufacturer.
+
+--- rt2500.orig/Module/rtmp_main.c
++++ rt2500/Module/rtmp_main.c
+@@ -58,7 +58,7 @@
+ 
+ static char *ifname = NULL ;
+ MODULE_PARM(ifname, "s");
+-MODULE_PARM_DESC(ifname, "Network device name (default ra%d)");
++MODULE_PARM_DESC(ifname, "Network device name (default eth%d)");
+ #else
+ static int debug = 0;	/* Default is off. */
+ module_param(debug, int, 0);
+@@ -66,7 +66,7 @@
+ 
+ static char *ifname = NULL ;
+ module_param(ifname, charp, 0);
+-MODULE_PARM_DESC(ifname, "Network device name (default ra%d)");
++MODULE_PARM_DESC(ifname, "Network device name (default eth%d)");
+ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) */
+ 
+ // Following information will be show when you run 'modinfo'
+@@ -315,9 +315,8 @@
+ 
+ 
+     // register_netdev() will call dev_alloc_name() for us
+-    // TODO: Remove the following line to keep the default eth%d name
+     if (ifname == NULL)
+-       strcpy(net_dev->name, "ra%d");
++       strcpy(net_dev->name, "eth%d");
+     else
+        strncpy(net_dev->name, ifname, IFNAMSIZ);
+ 

Deleted: tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/005_fix_error_rate_vars.diff
===================================================================
--- unstable/rt2500/debian/patches/005_fix_error_rate_vars.diff	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/005_fix_error_rate_vars.diff	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,33 +0,0 @@
---- rt2500.orig/Module/mlme.c
-+++ rt2500/Module/mlme.c
-@@ -897,7 +897,7 @@
- {
-     ULONG TxFailCnt, TxOkCnt, TxRetryCnt, TxCnt;
-     ULONG RxFailCnt, RxOkCnt, RxCnt, Cnt0, OldFcsCount;
--    static ULONG TxPER = 0, TxPRR = 0, RxPER = 0;
-+    ULONG TxPRR, RxPER;
- 
-     //
-     // monitor TX counters change for the past period
-@@ -911,10 +911,9 @@
-     TxCnt = TxOkCnt + TxFailCnt;
- 
-     if (TxCnt > 5) // if too few TX samples, skip TX related statistics
--    {
--        TxPER = (TxFailCnt * 100) / TxCnt;
-         TxPRR = ((TxRetryCnt + TxFailCnt) * 100) / TxCnt;
--    }
-+    else
-+	TxPRR = 0;
- 
-     //
-     // calculate RX PER
-@@ -941,6 +940,8 @@
- 
-     if (RxCnt > 5)
-         RxPER = (RxFailCnt * 100) / RxCnt;
-+    else
-+	RxPER = 0;
- //KPRINT(KERN_INFO,"!! WiFi: Ok: %d, Fail: %d, PER: %d\n", RxOkCnt, RxFailCnt, RxPER);
-     //
-     // decide ChannelQuality based on: 1)last BEACON received time, 2)last RSSI, 3)TxPER, and 4)RxPER

Copied: tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/005_fix_error_rate_vars.diff (from rev 161, unstable/rt2500/debian/patches/005_fix_error_rate_vars.diff)
===================================================================
--- tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/005_fix_error_rate_vars.diff	                        (rev 0)
+++ tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/005_fix_error_rate_vars.diff	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,37 @@
+Error rate variables were static and therefore shared between interfaces.
+Their values are recalculated each time, so make them local non-static and
+remove the one that is never used.
+
+--- rt2500.orig/Module/mlme.c
++++ rt2500/Module/mlme.c
+@@ -897,7 +897,7 @@
+ {
+     ULONG TxFailCnt, TxOkCnt, TxRetryCnt, TxCnt;
+     ULONG RxFailCnt, RxOkCnt, RxCnt, Cnt0, OldFcsCount;
+-    static ULONG TxPER = 0, TxPRR = 0, RxPER = 0;
++    ULONG TxPRR, RxPER;
+ 
+     //
+     // monitor TX counters change for the past period
+@@ -911,10 +911,9 @@
+     TxCnt = TxOkCnt + TxFailCnt;
+ 
+     if (TxCnt > 5) // if too few TX samples, skip TX related statistics
+-    {
+-        TxPER = (TxFailCnt * 100) / TxCnt;
+         TxPRR = ((TxRetryCnt + TxFailCnt) * 100) / TxCnt;
+-    }
++    else
++	TxPRR = 0;
+ 
+     //
+     // calculate RX PER
+@@ -941,6 +940,8 @@
+ 
+     if (RxCnt > 5)
+         RxPER = (RxFailCnt * 100) / RxCnt;
++    else
++	RxPER = 0;
+ //KPRINT(KERN_INFO,"!! WiFi: Ok: %d, Fail: %d, PER: %d\n", RxOkCnt, RxFailCnt, RxPER);
+     //
+     // decide ChannelQuality based on: 1)last BEACON received time, 2)last RSSI, 3)TxPER, and 4)RxPER

Copied: tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/007_no_config_file.diff (from rev 158, unstable/rt2500/debian/patches/007_no_config_file.diff)
===================================================================
--- tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/007_no_config_file.diff	                        (rev 0)
+++ tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/007_no_config_file.diff	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,21 @@
+Disable reading parameters from file; this was deprecated and the
+implementation fails to build for current kernels.
+
+--- rt2500-1.1.0-b4+cvs20080623.orig/Module/rtmp_init.c
++++ rt2500-1.1.0-b4+cvs20080623/Module/rtmp_init.c
+@@ -1385,6 +1385,7 @@
+ VOID RTMPReadParametersFromFile(
+     IN  PRTMP_ADAPTER pAd)
+ {
++#if 0
+     PUCHAR                                  src;
+     struct file                             *srcf;
+     INT                                     retval, orgfsuid, orgfsgid;
+@@ -1987,6 +1988,7 @@
+     current->fsuid = orgfsuid;
+     current->fsgid = orgfsgid;
+     kfree(buffer);
++#endif // 0
+ }
+ /*
+     ========================================================================

Copied: tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/008_use_netdev_functions.diff (from rev 159, unstable/rt2500/debian/patches/008_use_netdev_functions.diff)
===================================================================
--- tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/008_use_netdev_functions.diff	                        (rev 0)
+++ tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/008_use_netdev_functions.diff	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,170 @@
+Use proper function to get private data from net_device (the priv member
+was removed in 2.6.29).
+Use proper function to free the net_device.
+
+--- rt2500-1.1.0-b4+cvs20080623.orig/Module/rtmp_main.c
++++ rt2500-1.1.0-b4+cvs20080623/Module/rtmp_main.c
+@@ -292,7 +292,7 @@
+ 
+     // Save CSR virtual address and irq to device structure
+     net_dev->base_addr = (unsigned long)csr_addr;
+-    pAd = net_dev->priv;
++    pAd = netdev_priv(net_dev);
+     pAd->CSRBaseAddress = net_dev->base_addr;
+     pAd->net_dev = net_dev;
+ 
+@@ -388,7 +388,7 @@
+ INT RT2500_open(
+     IN  struct net_device *net_dev)
+ {
+-    PRTMP_ADAPTER   pAd = net_dev->priv;
++    PRTMP_ADAPTER   pAd = netdev_priv(net_dev);
+     INT             status = NDIS_STATUS_SUCCESS;
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+@@ -510,7 +510,7 @@
+     IN  struct net_device *net_dev)
+ {
+     NDIS_STATUS     Status = NDIS_STATUS_SUCCESS;
+-    PRTMP_ADAPTER   pAdapter = net_dev->priv;
++    PRTMP_ADAPTER   pAdapter = netdev_priv(net_dev);
+ 
+     DBGPRINT(RT_DEBUG_INFO, "<==== RTMPSendPackets\n");
+ 
+@@ -595,7 +595,7 @@
+ #endif
+ {
+     struct net_device   *net_dev = dev_instance;
+-    PRTMP_ADAPTER       pAdapter = net_dev->priv;
++    PRTMP_ADAPTER       pAdapter = netdev_priv(net_dev);
+     INTSRC_STRUC        IntSource;
+     int         ret = 0;
+ 
+@@ -708,7 +708,7 @@
+ 
+ int rt2500_set_mac_address(struct net_device *net_dev, void *addr)
+ {
+-	RTMP_ADAPTER		*pAd = net_dev->priv;
++	RTMP_ADAPTER		*pAd = netdev_priv(net_dev);
+ 	struct sockaddr		*mac = (struct sockaddr*) addr;
+ 	u32			set_mac;
+ 
+@@ -766,7 +766,7 @@
+ struct iw_statistics *RT2500_get_wireless_stats(
+     IN  struct net_device *net_dev)
+ {
+-    RTMP_ADAPTER *pAd = net_dev->priv;
++    RTMP_ADAPTER *pAd = netdev_priv(net_dev);
+ 
+     // TODO: All elements are zero before be implemented
+ 
+@@ -808,7 +808,7 @@
+ struct net_device_stats *RT2500_get_ether_stats(
+     IN  struct net_device *net_dev)
+ {
+-    RTMP_ADAPTER *pAd = net_dev->priv;
++    RTMP_ADAPTER *pAd = netdev_priv(net_dev);
+ 
+     DBGPRINT(RT_DEBUG_INFO, "RT2500_get_ether_stats --->\n");
+ 
+@@ -868,7 +868,7 @@
+     IN  struct net_device *net_dev)
+ {
+     RTMP_ADAPTER *pAd;
+-    pAd = net_dev->priv;
++    pAd = netdev_priv(net_dev);
+     if (pAd->PortCfg.BssType == BSS_MONITOR)
+     {
+         RTMP_IO_WRITE32(pAd, RXCSR0, 0x46);
+@@ -895,7 +895,7 @@
+ INT RT2500_close(
+     IN  struct net_device *net_dev)
+ {
+-    RTMP_ADAPTER    *pAd = net_dev->priv;
++    RTMP_ADAPTER    *pAd = netdev_priv(net_dev);
+     // LONG            ioaddr = net_dev->base_addr;
+ 
+     DBGPRINT(RT_DEBUG_TRACE, "%s: ===> RT2500_close\n", net_dev->name);
+@@ -949,7 +949,7 @@
+ 	rt2500pci_close_debugfs(pAd);
+ 
+     // Free Ring buffers
+-    RTMPFreeDMAMemory(net_dev->priv);
++    RTMPFreeDMAMemory(netdev_priv(net_dev));
+ 
+     // Unregister network device
+     unregister_netdev(net_dev);
+@@ -964,7 +964,7 @@
+     pci_disable_device(pPci_Dev);
+ 
+     // Free pre-allocated net_device memory
+-    kfree(net_dev);
++    free_netdev(net_dev);
+ }
+ 
+ //
+@@ -989,7 +989,7 @@
+ static int rt2500_suspend(struct pci_dev *pdev, pm_message_t state)
+ {
+     struct net_device *dev = pci_get_drvdata(pdev);
+-    PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++    PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+ 
+ 
+     if(pAdapter->PortCfg.bRadio)
+@@ -1020,7 +1020,7 @@
+ static int rt2500_resume(struct pci_dev *pdev)
+ {
+     struct net_device *dev = pci_get_drvdata(pdev);
+-    PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++    PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+     int status;
+ 
+ 	// FIXME: code should process error case correctly
+--- rt2500-1.1.0-b4+cvs20080623.orig/Module/rtmp_info.c
++++ rt2500-1.1.0-b4+cvs20080623/Module/rtmp_info.c
+@@ -237,7 +237,7 @@
+ 		   struct iw_request_info *info,
+ 		   struct iw_point *data, char *extra)
+ {
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+ 	struct iw_range *range = (struct iw_range *) extra;
+ 	u16 val;
+ 	int i,chan;
+@@ -346,7 +346,7 @@
+ rt_ioctl_setparam(struct net_device *dev, struct iw_request_info *info,
+ 			 void *w, char *extra)
+ {
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+ 	struct rt_priv_support *PRTMP_PRIVATE_SET_PROC;
+ 	char *this_char;
+ 	char *value;
+@@ -395,7 +395,7 @@
+ 			struct iw_point *data, char *extra)
+ {
+ 	ULONG								Now;
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+ 	int Status = NDIS_STATUS_SUCCESS;
+ 	BOOLEAN 		StateMachineTouched = FALSE;
+ 
+@@ -455,7 +455,7 @@
+ 			struct iw_point *data, char *extra)
+ {
+ 
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+ 	int i=2, j;
+ 	char *current_ev = extra;
+ 	char *end_buf = extra + IW_SCAN_MAX_DATA;
+@@ -1663,7 +1663,7 @@
+     IN  OUT struct ifreq    *rq,
+     IN  INT                 cmd)
+ {
+-    PRTMP_ADAPTER                       pAdapter= net_dev->priv;
++    PRTMP_ADAPTER                       pAdapter= netdev_priv(net_dev);
+     struct iwreq                        *wrq = (struct iwreq *) rq;
+     struct iw_point                     *erq = NULL;
+     struct iw_freq                      *frq = NULL;

Copied: tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/009_iwe_stream_update.diff (from rev 165, unstable/rt2500/debian/patches/009_iwe_stream_update.diff)
===================================================================
--- tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/009_iwe_stream_update.diff	                        (rev 0)
+++ tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/009_iwe_stream_update.diff	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,82 @@
+Pass the extra argument to iwe_stream_add_*() functions required from 2.6.27.
+Define wrapper macros for earlier kernel versions.
+
+--- rt2500-1.1.0-b4+cvs20080623.orig/Module/rtmp_info.c
++++ rt2500-1.1.0-b4+cvs20080623/Module/rtmp_info.c
+@@ -54,6 +54,15 @@
+ #define IW_ESSID_MAX_SIZE   32
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
++#define iwe_stream_add_event(info, stream, ends, iwe, event_len)	\
++	iwe_stream_add_event(stream, ends, iwe, event_len)
++#define iwe_stream_add_point(info, stream, ends, iwe, extra)		\
++	iwe_stream_add_point(stream, ends, iwe, extra)
++#define iwe_stream_add_value(info, event, value, ends, iwe, event_len)	\
++	iwe_stream_add_value(event, value, ends, iwe, event_len)
++#endif
++
+ #define NR_WEP_KEYS 4
+ #define WEP_SMALL_KEY_LEN (40/8)
+ #define WEP_LARGE_KEY_LEN (104/8)
+@@ -491,7 +500,7 @@
+ 		iwe.cmd = SIOCGIWAP;
+ 		iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
+ 				memcpy(iwe.u.ap_addr.sa_data, &pAdapter->PortCfg.BssTab.BssEntry[i].Bssid, ETH_ALEN);
+-			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);
+ 		//================================
+ 		memset(&iwe, 0, sizeof(iwe));
+ 		iwe.cmd = SIOCGIWMODE;
+@@ -509,13 +518,13 @@
+ 		}
+ 
+ 		iwe.len = IW_EV_UINT_LEN;
+-		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);
+ 		//================================
+ 		memset(&iwe, 0, sizeof(iwe));
+ 		iwe.cmd = SIOCGIWESSID;
+ 		iwe.u.data.length = pAdapter->PortCfg.BssTab.BssEntry[i].SsidLen;
+ 		iwe.u.data.flags = 1;
+-		current_ev = iwe_stream_add_point(current_ev,end_buf, &iwe, pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
++		current_ev = iwe_stream_add_point(info, current_ev,end_buf, &iwe, pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
+ 		//================================
+ 		memset(&iwe, 0, sizeof(iwe));
+ 		iwe.cmd = SIOCGIWENCODE;
+@@ -523,7 +532,7 @@
+ 			iwe.u.data.flags =IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
+ 		else
+ 			iwe.u.data.flags = IW_ENCODE_DISABLED;
+-		current_ev = iwe_stream_add_point(current_ev, end_buf,&iwe,  pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
++		current_ev = iwe_stream_add_point(info, current_ev, end_buf,&iwe,  pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
+ 
+ 		//================================
+ 		memset(&iwe, 0, sizeof(iwe));
+@@ -534,7 +543,7 @@
+ 		{
+ 			iwe.u.bitrate.value = RateIdToMbps[pAdapter->PortCfg.BssTab.BssEntry[i].Rates[i]/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);
+ 		}
+@@ -547,7 +556,7 @@
+ 			iwe.u.freq.m = pAdapter->PortCfg.BssTab.BssEntry[i].Channel;
+ 		iwe.u.freq.e = 0;
+ 		iwe.u.freq.i = 0;
+-		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);
+ 		//================================
+ 		memset(&iwe, 0, sizeof(iwe));
+                 iwe.cmd = IWEVQUAL;
+@@ -559,7 +568,7 @@
+ 		iwe.u.qual.noise = pAdapter->PortCfg.BssTab.BssEntry[i].Noise;
+                 //iwe.u.qual.noise = (pAdapter->PortCfg.LastR17Value > BBP_R17_DYNAMIC_UP_BOUND) ? BBP_R17_DYNAMIC_UP_BOUND : ((ULONG) pAdapter->PortCfg.LastR17Value);           // // noise level (dBm)
+ 
+-                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);
+ 
+ 
+                 //================================

Deleted: tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/series
===================================================================
--- unstable/rt2500/debian/patches/series	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/series	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,3 +0,0 @@
-000_if_name.diff
-005_fix_error_rate_vars.diff
-006_fix_probe_request_overflow.diff

Copied: tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/series (from rev 160, unstable/rt2500/debian/patches/series)
===================================================================
--- tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/series	                        (rev 0)
+++ tags/rt2500-1:1.1.0-b4+cvs20080623-4/debian/patches/series	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,6 @@
+000_if_name.diff
+005_fix_error_rate_vars.diff
+006_fix_probe_request_overflow.diff
+007_no_config_file.diff
+008_use_netdev_functions.diff
+009_iwe_stream_update.diff


Property changes on: tags/rt2570-1.1.0+cvs20080623-3
___________________________________________________________________
Added: mergeWithUpstream
   + 1
Added: svn:mergeinfo
   + 

Copied: tags/rt2570-1.1.0+cvs20080623-3/debian/NEWS (from rev 179, unstable/rt2570/debian/NEWS)
===================================================================
--- tags/rt2570-1.1.0+cvs20080623-3/debian/NEWS	                        (rev 0)
+++ tags/rt2570-1.1.0+cvs20080623-3/debian/NEWS	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,10 @@
+rt2570 (1.1.0+cvs20080623-3) unstable; urgency=low
+
+  * rt2570 is no longer supported by Ralink or the community around
+    rt2x00.serialmonkey.net.  We cannot provide much support for it, and
+    recommend that you use the rt2500usb driver included with the Linux
+    kernel.
+  * If rt2570 works (or used to work) with your card but rt2500usb does
+    not, please report a bug against the linux-2.6 package.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 14 Apr 2009 02:09:07 +0100

Copied: tags/rt2570-1.1.0+cvs20080623-3/debian/README.source (from rev 169, unstable/rt2570/debian/README.source)
===================================================================
--- tags/rt2570-1.1.0+cvs20080623-3/debian/README.source	                        (rev 0)
+++ tags/rt2570-1.1.0+cvs20080623-3/debian/README.source	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,4 @@
+Changes to upstream source are organised as a quilt patch series.
+
+Run debian/rules patch to apply all patches and debian/rules unpatch
+to remove them.  See the quilt documentation for more information.

Deleted: tags/rt2570-1.1.0+cvs20080623-3/debian/changelog
===================================================================
--- unstable/rt2570/debian/changelog	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt2570-1.1.0+cvs20080623-3/debian/changelog	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,93 +0,0 @@
-rt2570 (1.1.0+cvs20080623-2) unstable; urgency=high
-
-  * Fixed buffer overflow vulnerability in processing of ad-hoc probe
-    requests (CVE-2009-0282) (closes: bug#513001)
-
- -- Ben Hutchings <ben at decadent.org.uk>  Wed, 28 Jan 2009 00:39:19 +0000
-
-rt2570 (1.1.0+cvs20080623-1) unstable; urgency=low
-
-  * New CVS snapshot
-    - Fixes compile error with Linux 2.6.24 and later
-    - Fixes suspend/resume
-    - Obsoletes 004_fix_mlme_queue_locking.diff  
-  * Copied recommendations and suggestions from modules packages to
-    rt2570-source to make them more visible
-  * Modified 000_if_name.diff to apply at -p1 (closes: bug#485266)
-
- -- Ben Hutchings <ben at decadent.org.uk>  Mon, 23 Jun 2008 02:18:46 +0100
-
-rt2570 (1.1.0+cvs20070927-1) unstable; urgency=low
-
-  * New CVS snapshot
-    - Believed to be SMP-safe (closes: bug#423127)
-    - Supports Linux 2.6.22 (closes: bug#432533)
-  * Added suggestion of rutilt package
-  * Fixed some race conditions in processing of queued work, with help
-    from Bryan Batten (004_fix_mlme_queue_locking.diff)
-  * Fixed some miscalculated delays (005_fix_delays.diff)
-  * Changed probing code to reject devices which require the rt73 driver
-    (006_fix_probe_148f_2573.diff)
-  * Added dependency of rt2500-source on bzip2 (closes: bug#448719)
-
- -- Ben Hutchings <ben at decadent.org.uk>  Sun, 11 Nov 2007 23:55:23 +0000
-
-rt2570 (1.1.0+cvs20070219-2) unstable; urgency=low
-
-  * Switch maintainer to "Debian Ralink packages maintainers".
-  * Move Ben Hutchings to uploaders, and add Romain Beauxis to uploaders.
-  * Use quilt for patch management.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Mon,  5 Mar 2007 17:17:22 +0100
-
-rt2570 (1.1.0+cvs20070219-1) unstable; urgency=low
-
-  * Switch Maintainer and Uploader.
-  * New CVS snaphost.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 20 Feb 2007 01:00:55 +0100
-
-rt2570 (1.1.0+cvs20061231-2) unstable; urgency=low
-
-  * Use bzip2 instead of gzip to compress the sources. 
-
- -- Aurelien Jarno <aurel32 at debian.org>  Wed,  3 Jan 2007 21:03:54 +0100
-
-rt2570 (1.1.0+cvs20061231-1) unstable; urgency=low
-
-  * New CVS version.
-    - Fix SSID with kernels >= 2.6.19.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sun, 31 Dec 2006 18:29:47 +0100
-
-rt2570 (1.1.0+cvs20061210-1) unstable; urgency=low
-
-  * New upstream CVS.
-    - Fix build with kernels >= 2.6.19.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sun, 10 Dec 2006 16:06:06 +0100
-
-rt2570 (1.1.0+cvs20060620-3) unstable; urgency=low
-
-  * debian/rules: fix a bashims (closes: bug#385206).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Wed, 30 Aug 2006 15:03:38 +0200
-
-rt2570 (1.1.0+cvs20060620-2) unstable; urgency=low
-
-  * Fixed a typo in the description. 
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue,  1 Aug 2006 16:42:08 +0200
-
-rt2570 (1.1.0+cvs20060620-1) unstable; urgency=low
-
-  * New upstream CVS.
-  * Bumped Standards-Version to 3.7.2 (no changes).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 11 Jul 2006 11:29:20 +0200
-
-rt2570 (1.1.0+cvs20060421-1) unstable; urgency=low
-
-  * Initial Release (closes: bug#339599).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sun, 29 May 2005 19:03:04 +0200

Copied: tags/rt2570-1.1.0+cvs20080623-3/debian/changelog (from rev 177, unstable/rt2570/debian/changelog)
===================================================================
--- tags/rt2570-1.1.0+cvs20080623-3/debian/changelog	                        (rev 0)
+++ tags/rt2570-1.1.0+cvs20080623-3/debian/changelog	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,103 @@
+rt2570 (1.1.0+cvs20080623-3) unstable; urgency=low
+
+  * Fix compatibility with kernel versions 2.6.27-2.6.29
+  * Use proper function to free the net_device
+  * Update Standards-Version to 3.8.1:
+    - Add README.source
+  * Move to the new 'kernel' section
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 14 Apr 2009 01:16:20 +0100
+
+rt2570 (1.1.0+cvs20080623-2) unstable; urgency=high
+
+  * Fixed buffer overflow vulnerability in processing of ad-hoc probe
+    requests (CVE-2009-0282) (closes: bug#513001)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 28 Jan 2009 00:39:19 +0000
+
+rt2570 (1.1.0+cvs20080623-1) unstable; urgency=low
+
+  * New CVS snapshot
+    - Fixes compile error with Linux 2.6.24 and later
+    - Fixes suspend/resume
+    - Obsoletes 004_fix_mlme_queue_locking.diff  
+  * Copied recommendations and suggestions from modules packages to
+    rt2570-source to make them more visible
+  * Modified 000_if_name.diff to apply at -p1 (closes: bug#485266)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 23 Jun 2008 02:18:46 +0100
+
+rt2570 (1.1.0+cvs20070927-1) unstable; urgency=low
+
+  * New CVS snapshot
+    - Believed to be SMP-safe (closes: bug#423127)
+    - Supports Linux 2.6.22 (closes: bug#432533)
+  * Added suggestion of rutilt package
+  * Fixed some race conditions in processing of queued work, with help
+    from Bryan Batten (004_fix_mlme_queue_locking.diff)
+  * Fixed some miscalculated delays (005_fix_delays.diff)
+  * Changed probing code to reject devices which require the rt73 driver
+    (006_fix_probe_148f_2573.diff)
+  * Added dependency of rt2500-source on bzip2 (closes: bug#448719)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 11 Nov 2007 23:55:23 +0000
+
+rt2570 (1.1.0+cvs20070219-2) unstable; urgency=low
+
+  * Switch maintainer to "Debian Ralink packages maintainers".
+  * Move Ben Hutchings to uploaders, and add Romain Beauxis to uploaders.
+  * Use quilt for patch management.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon,  5 Mar 2007 17:17:22 +0100
+
+rt2570 (1.1.0+cvs20070219-1) unstable; urgency=low
+
+  * Switch Maintainer and Uploader.
+  * New CVS snaphost.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 20 Feb 2007 01:00:55 +0100
+
+rt2570 (1.1.0+cvs20061231-2) unstable; urgency=low
+
+  * Use bzip2 instead of gzip to compress the sources. 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed,  3 Jan 2007 21:03:54 +0100
+
+rt2570 (1.1.0+cvs20061231-1) unstable; urgency=low
+
+  * New CVS version.
+    - Fix SSID with kernels >= 2.6.19.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 31 Dec 2006 18:29:47 +0100
+
+rt2570 (1.1.0+cvs20061210-1) unstable; urgency=low
+
+  * New upstream CVS.
+    - Fix build with kernels >= 2.6.19.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 10 Dec 2006 16:06:06 +0100
+
+rt2570 (1.1.0+cvs20060620-3) unstable; urgency=low
+
+  * debian/rules: fix a bashims (closes: bug#385206).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed, 30 Aug 2006 15:03:38 +0200
+
+rt2570 (1.1.0+cvs20060620-2) unstable; urgency=low
+
+  * Fixed a typo in the description. 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue,  1 Aug 2006 16:42:08 +0200
+
+rt2570 (1.1.0+cvs20060620-1) unstable; urgency=low
+
+  * New upstream CVS.
+  * Bumped Standards-Version to 3.7.2 (no changes).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 11 Jul 2006 11:29:20 +0200
+
+rt2570 (1.1.0+cvs20060421-1) unstable; urgency=low
+
+  * Initial Release (closes: bug#339599).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 29 May 2005 19:03:04 +0200

Deleted: tags/rt2570-1.1.0+cvs20080623-3/debian/control
===================================================================
--- unstable/rt2570/debian/control	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt2570-1.1.0+cvs20080623-3/debian/control	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,27 +0,0 @@
-Source: rt2570
-Section: net
-Priority: extra
-Build-Depends: debhelper (>= 4.0), bzip2, quilt
-Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
-Uploaders: Aurelien Jarno <aurel32 at debian.org>, Ben Hutchings <ben at decadent.org.uk>, Romain Beauxis <toots at rastageeks.org>
-Standards-Version: 3.7.2
-Homepage: http://rt2x00.serialmonkey.com/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ralink/unstable/rt2570
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ralink/unstable/rt2570
-
-Package: rt2570-source
-Architecture: all
-Depends: debhelper (>= 4.0), module-assistant, bzip2
-Recommends: wireless-tools
-Suggests: rutilt
-Description: source for rt2570 wireless network driver
- This package provides source code for the rt2570 driver for Linux.
- This driver supports USB wireless network cards with the Ralink
- RT2500USB chipset.  An alternate driver, rt2500usb, is available in
- the rt2x00-source package and in the Linux kernel from version
- 2.6.24.
- .
- In order to compile the driver you need the kernel sources (or
- the linux-headers for the linux-image packages from Debian). For
- compile instructions look into /usr/share/doc/rt2570-source/README.Debian
- or simply use the module-assistant utility.

Copied: tags/rt2570-1.1.0+cvs20080623-3/debian/control (from rev 171, unstable/rt2570/debian/control)
===================================================================
--- tags/rt2570-1.1.0+cvs20080623-3/debian/control	                        (rev 0)
+++ tags/rt2570-1.1.0+cvs20080623-3/debian/control	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,27 @@
+Source: rt2570
+Section: kernel
+Priority: extra
+Build-Depends: debhelper (>= 4.0), bzip2, quilt
+Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
+Uploaders: Aurelien Jarno <aurel32 at debian.org>, Ben Hutchings <ben at decadent.org.uk>, Romain Beauxis <toots at rastageeks.org>
+Standards-Version: 3.8.1
+Homepage: http://rt2x00.serialmonkey.com/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-ralink/unstable/rt2570
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ralink/unstable/rt2570
+
+Package: rt2570-source
+Architecture: all
+Depends: debhelper (>= 4.0), module-assistant, bzip2
+Recommends: wireless-tools
+Suggests: rutilt
+Description: source for rt2570 wireless network driver
+ This package provides source code for the rt2570 driver for Linux.
+ This driver supports USB wireless network cards with the Ralink
+ RT2500USB chipset.  An alternate driver, rt2500usb, is available in
+ the rt2x00-source package and in the Linux kernel from version
+ 2.6.24.
+ .
+ In order to compile the driver you need the kernel sources (or
+ the linux-headers for the linux-image packages from Debian). For
+ compile instructions look into /usr/share/doc/rt2570-source/README.Debian
+ or simply use the module-assistant utility.

Deleted: tags/rt2570-1.1.0+cvs20080623-3/debian/control.modules.in
===================================================================
--- unstable/rt2570/debian/control.modules.in	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt2570-1.1.0+cvs20080623-3/debian/control.modules.in	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,17 +0,0 @@
-Source: rt2570
-Section: net
-Priority: extra
-Build-Depends: debhelper (>= 4.0.0)
-Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
-Standards-Version: 3.7.2
-Homepage: http://rt2x00.serialmonkey.com/
-
-Package: rt2570-modules-_KVERS_
-Architecture: any
-Recommends: linux-image-_KVERS_, wireless-tools
-Suggests: rutilt
-Description: rt2570 wireless network driver
- This package contains the rt2570 driver for Linux _KVERS_.
- .
- This driver supports USB wireless network cards with the Ralink
- RT2500USB chipset.

Copied: tags/rt2570-1.1.0+cvs20080623-3/debian/control.modules.in (from rev 171, unstable/rt2570/debian/control.modules.in)
===================================================================
--- tags/rt2570-1.1.0+cvs20080623-3/debian/control.modules.in	                        (rev 0)
+++ tags/rt2570-1.1.0+cvs20080623-3/debian/control.modules.in	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,17 @@
+Source: rt2570
+Section: kernel
+Priority: extra
+Build-Depends: debhelper (>= 4.0.0)
+Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
+Standards-Version: 3.8.1
+Homepage: http://rt2x00.serialmonkey.com/
+
+Package: rt2570-modules-_KVERS_
+Architecture: any
+Recommends: linux-image-_KVERS_, wireless-tools
+Suggests: rutilt
+Description: rt2570 wireless network driver
+ This package contains the rt2570 driver for Linux _KVERS_.
+ .
+ This driver supports USB wireless network cards with the Ralink
+ RT2500USB chipset.

Copied: tags/rt2570-1.1.0+cvs20080623-3/debian/patches/008_use_netdev_functions.diff (from rev 162, unstable/rt2570/debian/patches/008_use_netdev_functions.diff)
===================================================================
--- tags/rt2570-1.1.0+cvs20080623-3/debian/patches/008_use_netdev_functions.diff	                        (rev 0)
+++ tags/rt2570-1.1.0+cvs20080623-3/debian/patches/008_use_netdev_functions.diff	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,386 @@
+Use proper function to get private data from net_device (the priv member
+was removed in 2.6.29).
+Use proper function to free the net_device.
+
+--- rt2570-1.1.0+cvs20080623.orig/Module/rtusb_main.c
++++ rt2570-1.1.0+cvs20080623/Module/rtusb_main.c
+@@ -275,7 +275,7 @@
+ struct net_device_stats *
+ rt_getstats(struct net_device *dev)
+ {
+-	PRT2570ADAPTER pAd = (PRT2570ADAPTER)dev->priv;
++	PRT2570ADAPTER pAd = netdev_priv(dev);
+ 	struct net_device_stats *stats= &pAd->net_device_stats;
+ 
+ 	stats->rx_bytes = pAd->RalinkCounters.ReceivedByteCount;
+@@ -309,7 +309,7 @@
+ struct iw_statistics *RTUSB_get_wireless_stats(
+     IN  struct net_device *net_dev)
+ {
+-    PRT2570ADAPTER pAd = (PRT2570ADAPTER)net_dev->priv;
++    PRT2570ADAPTER pAd = netdev_priv(net_dev);
+ 
+     DBGPRINT(RT_DEBUG_TRACE, "--->RTUSB_get_wireless_stats \n");
+ 
+@@ -336,7 +336,7 @@
+ 
+ int rt2570_set_mac_address(struct net_device *net_dev, void *addr)
+ {
+-	RT2570ADAPTER		*pAd = net_dev->priv;
++	RT2570ADAPTER		*pAd = netdev_priv(net_dev);
+ 	struct sockaddr		*mac = (struct sockaddr*) addr;
+ 
+ 	if(netif_running(net_dev))
+@@ -1396,7 +1396,7 @@
+ static int usb_rtusb_open(struct net_device *net_dev)
+ {
+ 
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) net_dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(net_dev);
+ 	NDIS_STATUS 	Status = NDIS_STATUS_SUCCESS;
+ 	//NDIS_802_11_WEP WepKey;
+ 
+@@ -1451,7 +1451,7 @@
+ 
+ static int usb_rtusb_close(struct net_device *net)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) net->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(net);
+ 
+ 	DECLARE_WAIT_QUEUE_HEAD (unlink_wakeup);
+ 	DECLARE_WAITQUEUE (wait, current);
+@@ -1884,14 +1884,14 @@
+ 		goto out_noalloc;
+ 	}
+ 
+-	pAdapter = netdev->priv;
++	pAdapter = netdev_priv(netdev);
+ 	pAdapter->usb = dev;
+ 
+ 	RTUSBReadMACRegister(pAdapter, MAC_CSR0, &version);
+ 	if (version == 0 || (le16_to_cpu(version) & 0xfff0) != 0)
+ 	{
+ 		KPRINT(KERN_INFO, "ASIC version not matching\n");
+-		kfree(netdev);
++		free_netdev(netdev);
+ 		res = -ENODEV;
+ 		goto out_noalloc;
+ 	}
+@@ -1904,7 +1904,6 @@
+ 
+ 	netdev->open = usb_rtusb_open;
+ 	netdev->stop = usb_rtusb_close;
+-	netdev->priv = pAdapter;
+ 	netdev->hard_start_xmit = RTUSBSendPackets;
+ 	netdev->get_stats = rt_getstats;
+ #if 1
+--- rt2570-1.1.0+cvs20080623.orig/Module/rtusb_info.c
++++ rt2570-1.1.0+cvs20080623/Module/rtusb_info.c
+@@ -200,7 +200,7 @@
+ 			struct iw_request_info *info,
+ 			struct iw_freq *freq, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++        PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 	int 	chan = -1;
+ 
+ 	//check if interface is down
+@@ -232,7 +232,7 @@
+ 		   struct iw_request_info *info,
+ 		   struct iw_freq *freq, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 	DBGPRINT(RT_DEBUG_TRACE,"==>IOCTL::rtusb_ioctl_giwfreq  %d\n",pAdapter->PortCfg.Channel);
+ 
+ 	//check if interface is down
+@@ -257,7 +257,7 @@
+ 		   struct iw_request_info *info,
+ 		   __u32 *mode, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 
+ 	//check if interface is down
+ 	if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -330,7 +330,7 @@
+ 		   struct iw_request_info *info,
+ 		   __u32 *mode, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 
+ 	//check if interface is down
+ 	if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -353,7 +353,7 @@
+ 		   struct iw_request_info *info,
+ 		   char *name, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 
+ 	//check if interface is down
+ 	if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -366,7 +366,7 @@
+ 		   struct iw_request_info *info,
+ 		   char *name, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 
+ 	//check if interface is down
+ 	if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -381,7 +381,7 @@
+ 		   struct iw_request_info *info,
+ 		   struct iw_point *data, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 	struct iw_range *range = (struct iw_range *) extra;
+ 	u16 val;
+ 	int i;
+@@ -485,7 +485,7 @@
+ 		      struct sockaddr *ap_addr, char *extra)
+ {
+ 
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 
+ 	//check if interface is down
+ 	if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -538,7 +538,7 @@
+ 			struct iw_point *data, char *extra)
+ {
+ 
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 	struct sockaddr addr[IW_MAX_AP];
+ 	struct iw_quality qual[IW_MAX_AP];
+ 	int i;
+@@ -568,7 +568,7 @@
+ 			struct iw_request_info *info,
+ 			struct iw_point *data, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 	int Status = STATUS_SUCCESS;
+ 
+ 	//check if interface is down
+@@ -619,7 +619,7 @@
+ 			struct iw_point *data, char *extra)
+ {
+ 
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 	int i=2, j;
+ 	char *current_ev = extra;
+ 	char *end_buf = extra + IW_SCAN_MAX_DATA;
+@@ -717,7 +717,7 @@
+ 			 struct iw_request_info *info,
+ 			 struct iw_point *data, char *essid)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 	NDIS_802_11_SSID					Ssid, *pSsid=NULL;
+ 	ULONG Length;
+ 
+@@ -775,7 +775,7 @@
+ 			 struct iw_request_info *info,
+ 			 struct iw_point *data, char *essid)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 
+ 	//check if interface is down
+ 	if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -798,7 +798,7 @@
+ 			 struct iw_request_info *info,
+ 			 struct iw_point *data, char *nickname)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 
+ 	//check if interface is down
+ 	if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -819,7 +819,7 @@
+ 			 struct iw_request_info *info,
+ 			 struct iw_point *data, char *nickname)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 
+ 	//check if interface is down
+ 	if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -839,7 +839,7 @@
+ 		       struct iw_request_info *info,
+ 		       struct iw_param *rts, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 	u16 val;
+ 
+ 	//check if interface is down
+@@ -863,7 +863,7 @@
+ 		       struct iw_request_info *info,
+ 		       struct iw_param *rts, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 
+ 	//check if interface is down
+ 	if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -881,7 +881,7 @@
+ 			struct iw_request_info *info,
+ 			struct iw_param *rts, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 	u16 val;
+ 
+ 	//check if interface is down
+@@ -903,7 +903,7 @@
+ 			struct iw_request_info *info,
+ 			struct iw_param *rts, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 
+ 	//check if interface is down
+ 	if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -920,7 +920,7 @@
+ 			  struct iw_request_info *info,
+ 			  struct iw_point *erq, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 	NDIS_802_11_WEP	WepKey;
+ 	int 	index, len;
+ 	CHAR	kid = 0;
+@@ -1017,7 +1017,7 @@
+ 			  struct iw_request_info *info,
+ 			  struct iw_point *erq, char *key)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 	int kid;
+ 
+ 	//check if interface is down
+@@ -1065,7 +1065,7 @@
+ rtusb_ioctl_setauth(struct net_device *dev, struct iw_request_info *info,
+ 			 void *w, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 	int param = *(int *) extra;
+ 
+ 	//check if interface is down
+@@ -1111,7 +1111,7 @@
+ 			 void *w, char *extra)
+ {
+ 
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+   	int param = *(int *)extra;
+ 	USHORT	Value;
+ 
+@@ -1155,7 +1155,7 @@
+ 			 void *w, char *extra)
+ {
+ 
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 	int param = *(int *)extra;
+ 	NDIS_802_11_WEP_STATUS				WepStatus;//set by OID_802_11_WEP_STATUS
+ 
+@@ -1213,7 +1213,7 @@
+ rtusb_ioctl_setwpapsk(struct net_device *dev, struct iw_request_info *info,
+ 			 void *w, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 	NDIS_802_11_KEY			Key;
+ 	// rtusb_ioctl_setwpapsk accept > 16 chars,
+ 	// so data is passed through w instead of extra.
+@@ -1281,7 +1281,7 @@
+                                   struct iw_request_info *info,
+                                   struct iw_point *data, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 	int param;
+ 
+ 	//check if interface is down
+@@ -1318,7 +1318,7 @@
+                                   struct iw_request_info *info,
+                                   int *i, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 
+ 	//check if interface is down
+ 	if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -1333,7 +1333,7 @@
+                                   struct iw_request_info *info,
+                                   struct iw_point *data, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 	int param = *(int *)extra;
+ 
+ 	//check if interface is down
+@@ -1368,7 +1368,7 @@
+                                            struct iw_request_info *info,
+                                            int *i, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 
+ 	//check if interface is down
+ 	if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -1383,7 +1383,7 @@
+                                   struct iw_request_info *info,
+                                   struct iw_point *data, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 	int param = *(int *)extra;
+ 
+ 	//check if interface is down
+@@ -1412,7 +1412,7 @@
+                                     struct iw_request_info *info,
+                                     int *i, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 
+ 	//check if interface is down
+ 	if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -1426,7 +1426,7 @@
+ static int rtusb_ioctl_setpsm(struct net_device *dev, struct iw_request_info *info,
+ 			 void *w, char *extra)
+ {
+-	PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++	PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ 	int param = *(int *)extra;
+ 
+ 	//check if interface is down
+@@ -4181,7 +4181,7 @@
+ int usb_rt2570_ioctl(struct net_device *net_dev, struct ifreq *rq,
+ 			  int cmd)
+ {
+-	PRT2570ADAPTER		pAdapter= net_dev->priv;
++	PRT2570ADAPTER		pAdapter= netdev_priv(net_dev);
+ 	struct iwreq						*wrq = (struct iwreq *) rq;
+ 	struct iw_point 					*erq = NULL;
+ 	struct iw_freq						*frq = NULL;
+--- rt2570-1.1.0+cvs20080623.orig/Module/rtusb_data.c
++++ rt2570-1.1.0+cvs20080623/Module/rtusb_data.c
+@@ -73,7 +73,7 @@
+ {
+ 
+ 	NDIS_STATUS 	Status = NDIS_STATUS_SUCCESS;
+-	PRT2570ADAPTER	pAdapter = net_dev->priv;
++	PRT2570ADAPTER	pAdapter = netdev_priv(net_dev);
+ 
+ 	skb->data_len = skb->len;
+ 	if (RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_RESET_IN_PROGRESS) ||

Copied: tags/rt2570-1.1.0+cvs20080623-3/debian/patches/009_use_kill_pid.diff (from rev 163, unstable/rt2570/debian/patches/009_use_kill_pid.diff)
===================================================================
--- tags/rt2570-1.1.0+cvs20080623-3/debian/patches/009_use_kill_pid.diff	                        (rev 0)
+++ tags/rt2570-1.1.0+cvs20080623-3/debian/patches/009_use_kill_pid.diff	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,24 @@
+kill_proc() was un-exported in 2.6.27 and later removed, so reimplement it
+using kill_pid().
+
+--- rt2570-1.1.0+cvs20080623.orig/Module/rtusb_init.c
++++ rt2570-1.1.0+cvs20080623/Module/rtusb_init.c
+@@ -42,6 +42,18 @@
+ #define RT2570_USB_ALLOC_URB(iso)	usb_alloc_urb(iso);
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
++int kill_proc(pid_t pid, int sig, int priv)
++{
++	int ret;
++
++	rcu_read_lock();
++	ret = kill_pid(find_vpid(pid), sig, priv);
++	rcu_read_unlock();
++	return ret;
++}
++#endif
++
+ USHORT	 BBPRegTable[] = {
+ 	0x0302,  // R03
+ 	0x0419,  // R04

Copied: tags/rt2570-1.1.0+cvs20080623-3/debian/patches/010_iwe_stream_update.diff (from rev 164, unstable/rt2570/debian/patches/010_iwe_stream_update.diff)
===================================================================
--- tags/rt2570-1.1.0+cvs20080623-3/debian/patches/010_iwe_stream_update.diff	                        (rev 0)
+++ tags/rt2570-1.1.0+cvs20080623-3/debian/patches/010_iwe_stream_update.diff	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,73 @@
+Pass the extra argument to iwe_stream_add_*() functions required from 2.6.27.
+Define wrapper macro for earlier kernel versions.
+
+--- rt2570-1.1.0+cvs20080623.orig/Module/rtusb_info.c
++++ rt2570-1.1.0+cvs20080623/Module/rtusb_info.c
+@@ -49,6 +49,15 @@
+ #define IW_ESSID_MAX_SIZE	32
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
++#define iwe_stream_add_event(info, stream, ends, iwe, event_len)	\
++	iwe_stream_add_event(stream, ends, iwe, event_len)
++#define iwe_stream_add_point(info, stream, ends, iwe, extra)		\
++	iwe_stream_add_point(stream, ends, iwe, extra)
++#define iwe_stream_add_value(info, event, value, ends, iwe, event_len)	\
++	iwe_stream_add_value(event, value, ends, iwe, event_len)
++#endif
++
+ extern UCHAR CipherWpa2Template[];
+ extern UCHAR CipherWpa2TemplateLen;
+ extern UCHAR CipherWpaPskTkip[];
+@@ -647,7 +656,7 @@
+ 		iwe.cmd = SIOCGIWAP;
+ 		iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
+ 				memcpy(iwe.u.ap_addr.sa_data, &pAdapter->PortCfg.BssTab.BssEntry[i].Bssid, ETH_ALEN);
+-			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);
+ 		//================================
+ 		memset(&iwe, 0, sizeof(iwe));
+ 		iwe.cmd = SIOCGIWMODE;
+@@ -665,13 +674,13 @@
+ 		}
+ 
+ 		iwe.len = IW_EV_UINT_LEN;
+-		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);
+ 		//================================
+ 		memset(&iwe, 0, sizeof(iwe));
+ 		iwe.cmd = SIOCGIWESSID;
+ 		iwe.u.data.length = pAdapter->PortCfg.BssTab.BssEntry[i].SsidLen;
+ 		iwe.u.data.flags = 1;
+-		current_ev = iwe_stream_add_point(current_ev,end_buf, &iwe, pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
++		current_ev = iwe_stream_add_point(info, current_ev,end_buf, &iwe, pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
+ 		//================================
+ 		memset(&iwe, 0, sizeof(iwe));
+ 		iwe.cmd = SIOCGIWENCODE;
+@@ -679,7 +688,7 @@
+ 			iwe.u.data.flags =IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
+ 		else
+ 			iwe.u.data.flags = IW_ENCODE_DISABLED;
+-		current_ev = iwe_stream_add_point(current_ev, end_buf,&iwe,  pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
++		current_ev = iwe_stream_add_point(info, current_ev, end_buf,&iwe,  pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
+ 
+ 		//================================
+ 		memset(&iwe, 0, sizeof(iwe));
+@@ -690,7 +699,7 @@
+ 		{
+ 			iwe.u.bitrate.value = RateIdToMbps[pAdapter->PortCfg.BssTab.BssEntry[i].Rates[i]/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);
+ 		}
+@@ -703,7 +712,7 @@
+ 			iwe.u.freq.m = pAdapter->PortCfg.BssTab.BssEntry[i].Channel;
+ 		iwe.u.freq.e = 0;
+ 		iwe.u.freq.i = 0;
+-		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);
+ 		//================================
+ 		memset(&iwe, 0, sizeof(iwe));
+ 

Deleted: tags/rt2570-1.1.0+cvs20080623-3/debian/patches/series
===================================================================
--- unstable/rt2570/debian/patches/series	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt2570-1.1.0+cvs20080623-3/debian/patches/series	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,4 +0,0 @@
-000_if_name.diff
-005_fix_delays.diff
-006_fix_probe_148f_2573.diff
-007_fix_probe_request_overflow.diff

Copied: tags/rt2570-1.1.0+cvs20080623-3/debian/patches/series (from rev 164, unstable/rt2570/debian/patches/series)
===================================================================
--- tags/rt2570-1.1.0+cvs20080623-3/debian/patches/series	                        (rev 0)
+++ tags/rt2570-1.1.0+cvs20080623-3/debian/patches/series	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,7 @@
+000_if_name.diff
+005_fix_delays.diff
+006_fix_probe_148f_2573.diff
+007_fix_probe_request_overflow.diff
+008_use_netdev_functions.diff
+009_use_kill_pid.diff
+010_iwe_stream_update.diff

Deleted: tags/rt2570-1.1.0+cvs20080623-3/debian/rules
===================================================================
--- unstable/rt2570/debian/rules	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt2570-1.1.0+cvs20080623-3/debian/rules	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,165 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 by Joey Hess.
-#
-# This version is for a hypothetical package that builds an
-# architecture-dependant package, as well as an architecture-independent
-# package.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# prefix of the target package name
-PACKAGE=rt2570-modules
-# modifieable for experiments or debugging m-a
-MA_DIR ?= /usr/share/modass
-# load generic variable handling
--include $(MA_DIR)/include/generic.make
-# load default rules
--include $(MA_DIR)/include/common-rules.make
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-clean:
-	dh_testdir
-	dh_testroot
-	-$(MAKE) -C Module clean
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	dh_clean	
-	rm -rf debian/build
-	rm -f *-stamp
-
-build-indep: build-indep-stamp
-build-indep-stamp:
-	dh_testdir
-
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-
-	# Copy most of the source tree into the temp directory and clean it
-	cd $(CURDIR)/Module \
-		&& find . -path ./debian/\* -type d -prune -o -print \
-		| egrep -v 'RPM|CVS|debian'  \
-		| cpio -admp $(CURDIR)/debian/build/usr/src/modules/rt2570
-	cp -f $(CURDIR)/FAQ $(CURDIR)/debian/build/usr/src/modules/rt2570
-	cp -f $(CURDIR)/THANKS $(CURDIR)/debian/build/usr/src/modules/rt2570
-	cp -f $(CURDIR)/CHANGELOG $(CURDIR)/debian/build/usr/src/modules/rt2570
-	ln -s /usr/share/doc/rt2570-source/README.Debian $(CURDIR)/debian/build/usr/src/modules/rt2570/INSTALL.Debian
-
-	mkdir $(CURDIR)/debian/build/usr/src/modules/rt2570/debian
-	cp -f $(CURDIR)/debian/*.modules.in $(CURDIR)/debian/build/usr/src/modules/rt2570/debian
-	cp -f $(CURDIR)/debian/changelog $(CURDIR)/debian/build/usr/src/modules/rt2570/debian
-	cp -f $(CURDIR)/debian/compat $(CURDIR)/debian/build/usr/src/modules/rt2570/debian
-	cp -f $(CURDIR)/debian/copyright $(CURDIR)/debian/build/usr/src/modules/rt2570/debian
-	cp -f $(CURDIR)/debian/rt2570-source.docs $(CURDIR)/debian/build/usr/src/modules/rt2570/debian/docs
-	cp -f $(CURDIR)/debian/rules $(CURDIR)/debian/build/usr/src/modules/rt2570/debian
-
-	cd $(CURDIR)/debian/build/usr/src/modules/rt2570 \
-		&& make clean
-	
-	touch build-indep-stamp
-
-install-indep: build-indep install-indep-stamp
-install-indep-stamp:
-	dh_testdir
-	dh_testroot
-	dh_clean -i -k
-	dh_installdirs -i
-	
-	# Pack this up into a tarball
-	chown -R root.src debian/build/usr/src/modules
-	mkdir -p debian/rt2570-source/usr/src
-	cd debian/build/usr/src \
-		&& tar cf - modules | bzip2 -9 > $(CURDIR)/debian/rt2570-source/usr/src/rt2570.tar.bz2
-	ln -s ../packages/default.sh \
-		debian/rt2570-source/usr/share/modass/overrides/rt2570-source
-
-	touch install-indep-stamp
-
-# Build architecture-independent files here.
-binary-indep: build-indep install-indep
-	dh_testdir -i
-	dh_testroot -i
-#	dh_installdebconf -i
-	dh_installdocs -i
-#	dh_installexamples -i
-#	dh_installmenu -i
-#	dh_installlogrotate -i
-#	dh_installemacsen -i
-#	dh_installpam -i
-#	dh_installmime -i
-#	dh_installinit -i
-#	dh_installcron -i
-	dh_installman -i
-#	dh_installinfo -i
-	dh_installmodules -i
-	dh_installchangelogs -i CHANGELOG
-	dh_strip -i
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_shlibdeps -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch:
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
-PATCHLEVEL := $(shell echo $(KVERS) | cut -d. -f2)
-
-.PHONY: kdist_config
-kdist_config: prep-deb-files
-
-.PHONY: binary_modules binary-modules
-binary-modules: binary_modules
-binary_modules: kdist_config
-
-	# Install module
-	dh_installdirs lib/modules/$(KVERS)/kernel/drivers/net/wireless
-
-	# Build modules
-ifeq ($(PATCHLEVEL), 4)
-	@if ! [ -x "/usr/bin/gcc-3.3" ] ; then \
-		echo "gcc-3.3 does not appear to be installed on your. It is necessary to be" ; \
-		echo "able to build the module on a 2.4 kernel. Please install it by running:" ; \
-		echo "  apt-get install gcc-3.3" ; \
-		false ; \
-	fi
-
-	$(MAKE) KERNDIR=$(KSRC) PATCHLEVEL=$(PATCHLEVEL) CC=gcc-3.3
-	install -m 0644 rt2570.o $(CURDIR)/debian/rt2570-modules-$(KVERS)/lib/modules/$(KVERS)/kernel/drivers/net/wireless
-endif
-ifeq ($(PATCHLEVEL), 6)
-	$(MAKE) KERNDIR=$(KSRC) PATCHLEVEL=$(PATCHLEVEL)
-	install -m 0644 rt2570.ko $(CURDIR)/debian/rt2570-modules-$(KVERS)/lib/modules/$(KVERS)/kernel/drivers/net/wireless
-endif
-
-	dh_testdir
-	dh_testroot
-	dh_installdocs 
-	dh_installmodules
-	dh_installchangelogs CHANGELOG
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol -- -v$(VERSION)
-	dh_md5sums
-	dh_builddeb --destdir=$(DEB_DESTDIR)
-
-.PHONY: kdist_clean
-kdist_clean:
-	touch config.mk \
-		&& $(MAKE) clean
-	-dh_clean

Copied: tags/rt2570-1.1.0+cvs20080623-3/debian/rules (from rev 153, unstable/rt2570/debian/rules)
===================================================================
--- tags/rt2570-1.1.0+cvs20080623-3/debian/rules	                        (rev 0)
+++ tags/rt2570-1.1.0+cvs20080623-3/debian/rules	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,168 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 by Joey Hess.
+#
+# This version is for a hypothetical package that builds an
+# architecture-dependant package, as well as an architecture-independent
+# package.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# prefix of the target package name
+PACKAGE=rt2570-modules
+# modifieable for experiments or debugging m-a
+MA_DIR ?= /usr/share/modass
+# load generic variable handling
+-include $(MA_DIR)/include/generic.make
+# load default rules
+-include $(MA_DIR)/include/common-rules.make
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+clean:
+	dh_testdir
+	dh_testroot
+	-$(MAKE) -C Module clean
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	dh_clean	
+	rm -rf debian/build
+	rm -f *-stamp
+
+patch: patch-stamp
+patch-stamp:
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	touch patch-stamp
+
+build-indep: build-indep-stamp
+build-indep-stamp: patch-stamp
+	dh_testdir
+
+	# Copy most of the source tree into the temp directory and clean it
+	cd $(CURDIR)/Module \
+		&& find . -path ./debian/\* -type d -prune -o -print \
+		| egrep -v 'RPM|CVS|debian'  \
+		| cpio -admp $(CURDIR)/debian/build/usr/src/modules/rt2570
+	cp -f $(CURDIR)/FAQ $(CURDIR)/debian/build/usr/src/modules/rt2570
+	cp -f $(CURDIR)/THANKS $(CURDIR)/debian/build/usr/src/modules/rt2570
+	cp -f $(CURDIR)/CHANGELOG $(CURDIR)/debian/build/usr/src/modules/rt2570
+	ln -s /usr/share/doc/rt2570-source/README.Debian $(CURDIR)/debian/build/usr/src/modules/rt2570/INSTALL.Debian
+
+	mkdir $(CURDIR)/debian/build/usr/src/modules/rt2570/debian
+	cp -f $(CURDIR)/debian/*.modules.in $(CURDIR)/debian/build/usr/src/modules/rt2570/debian
+	cp -f $(CURDIR)/debian/changelog $(CURDIR)/debian/build/usr/src/modules/rt2570/debian
+	cp -f $(CURDIR)/debian/compat $(CURDIR)/debian/build/usr/src/modules/rt2570/debian
+	cp -f $(CURDIR)/debian/copyright $(CURDIR)/debian/build/usr/src/modules/rt2570/debian
+	cp -f $(CURDIR)/debian/rt2570-source.docs $(CURDIR)/debian/build/usr/src/modules/rt2570/debian/docs
+	cp -f $(CURDIR)/debian/rules $(CURDIR)/debian/build/usr/src/modules/rt2570/debian
+
+	cd $(CURDIR)/debian/build/usr/src/modules/rt2570 \
+		&& make clean
+	
+	touch build-indep-stamp
+
+install-indep: build-indep install-indep-stamp
+install-indep-stamp:
+	dh_testdir
+	dh_testroot
+	dh_clean -i -k
+	dh_installdirs -i
+	
+	# Pack this up into a tarball
+	chown -R root.src debian/build/usr/src/modules
+	mkdir -p debian/rt2570-source/usr/src
+	cd debian/build/usr/src \
+		&& tar cf - modules | bzip2 -9 > $(CURDIR)/debian/rt2570-source/usr/src/rt2570.tar.bz2
+	ln -s ../packages/default.sh \
+		debian/rt2570-source/usr/share/modass/overrides/rt2570-source
+
+	touch install-indep-stamp
+
+# Build architecture-independent files here.
+binary-indep: build-indep install-indep
+	dh_testdir -i
+	dh_testroot -i
+#	dh_installdebconf -i
+	dh_installdocs -i
+#	dh_installexamples -i
+#	dh_installmenu -i
+#	dh_installlogrotate -i
+#	dh_installemacsen -i
+#	dh_installpam -i
+#	dh_installmime -i
+#	dh_installinit -i
+#	dh_installcron -i
+	dh_installman -i
+#	dh_installinfo -i
+	dh_installmodules -i
+	dh_installchangelogs -i CHANGELOG
+	dh_strip -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch:
+# We have nothing to do by default.
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
+
+PATCHLEVEL := $(shell echo $(KVERS) | cut -d. -f2)
+
+.PHONY: kdist_config
+kdist_config: prep-deb-files
+
+.PHONY: binary_modules binary-modules
+binary-modules: binary_modules
+binary_modules: kdist_config
+
+	# Install module
+	dh_installdirs lib/modules/$(KVERS)/kernel/drivers/net/wireless
+
+	# Build modules
+ifeq ($(PATCHLEVEL), 4)
+	@if ! [ -x "/usr/bin/gcc-3.3" ] ; then \
+		echo "gcc-3.3 does not appear to be installed on your. It is necessary to be" ; \
+		echo "able to build the module on a 2.4 kernel. Please install it by running:" ; \
+		echo "  apt-get install gcc-3.3" ; \
+		false ; \
+	fi
+
+	$(MAKE) KERNDIR=$(KSRC) PATCHLEVEL=$(PATCHLEVEL) CC=gcc-3.3
+	install -m 0644 rt2570.o $(CURDIR)/debian/rt2570-modules-$(KVERS)/lib/modules/$(KVERS)/kernel/drivers/net/wireless
+endif
+ifeq ($(PATCHLEVEL), 6)
+	$(MAKE) KERNDIR=$(KSRC) PATCHLEVEL=$(PATCHLEVEL)
+	install -m 0644 rt2570.ko $(CURDIR)/debian/rt2570-modules-$(KVERS)/lib/modules/$(KVERS)/kernel/drivers/net/wireless
+endif
+
+	dh_testdir
+	dh_testroot
+	dh_installdocs 
+	dh_installmodules
+	dh_installchangelogs CHANGELOG
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol -- -v$(VERSION)
+	dh_md5sums
+	dh_builddeb --destdir=$(DEB_DESTDIR)
+
+.PHONY: kdist_clean
+kdist_clean:
+	touch config.mk \
+		&& $(MAKE) clean
+	-dh_clean


Property changes on: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4
___________________________________________________________________
Added: svn:mergeinfo
   + 

Deleted: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/README
===================================================================
--- unstable/rt73/debian/README	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/README	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,25 +0,0 @@
-README.Debian for rt73-source
-
-1. Building rt73 kernel modules
-===============================
-
-This package is a source package that can be used to build modules that 
-work with your custom built linux kernel.  The source files are located 
-in /usr/src/rt73.tar.bz2; unpacking that file in /usr/src will produce 
-a build tree in /usr/src/modules/rt73/.  (The tar file can also be 
-unpacked elsewhere)
-
-- The Debian way (with module-assistant): install the "module-assistant"
-  package and the kernel-headers-* package corresponding to the kernel 
-  version you want to use, then run the following commands:
-
-  # module-assistant prepare               # May not be needed
-  # module-assistant get rt73
-  # module-assistant build rt73
-
-  You should now have an rt73-modules-<version>.deb file in /usr/src, 
-  which you can install with dpkg -i to get the modules installed.
-
-- The "by hand" way: if you prefer handling your kernel by hand, then
-  you're supposed to know what to do with rt73-source and I won't 
-  bother you any longer.

Copied: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/README (from rev 175, unstable/rt73/debian/README)
===================================================================
--- tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/README	                        (rev 0)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/README	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,33 @@
+README.Debian for rt73-source
+
+1. Building rt73 kernel modules
+===============================
+
+This package is a source package that can be used to build modules that 
+work with your custom built linux kernel.  The source files are located 
+in /usr/src/rt73.tar.bz2; unpacking that file in /usr/src will produce 
+a build tree in /usr/src/modules/rt73/.  (The tar file can also be 
+unpacked elsewhere)
+
+- The Debian way (with module-assistant): install the "module-assistant"
+  package and the kernel-headers-* package corresponding to the kernel 
+  version you want to use, then run the following commands:
+
+  # module-assistant prepare               # May not be needed
+  # module-assistant get rt73
+  # module-assistant build rt73
+
+  You should now have an rt73-modules-<version>.deb file in /usr/src, 
+  which you can install with dpkg -i to get the modules installed.
+
+- The "by hand" way: if you prefer handling your kernel by hand, then
+  you're supposed to know what to do with rt73-source and I won't 
+  bother you any longer.
+
+2. Module blacklisting
+======================
+
+In order to use rt73 rather the in-tree rt73usb, you should create
+a file under /etc/modprobe.d containing the line:
+
+    blacklist rt73usb

Copied: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/README.source (from rev 169, unstable/rt73/debian/README.source)
===================================================================
--- tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/README.source	                        (rev 0)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/README.source	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,5 @@
+Changes to upstream source are organised as a quilt patch series.
+
+Run "QUILT_PATCHES=debian/patches quilt push -a" to apply all patches
+and "QUILT_PATCHES=debian/patches quilt pop -a" to remove them.  See
+the quilt documentation for more information.

Deleted: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/changelog
===================================================================
--- unstable/rt73/debian/changelog	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/changelog	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,111 +0,0 @@
-rt73 (1:1.0.3.6-cvs20080623-dfsg1-3) unstable; urgency=high
-
-  * Fixed buffer overflow vulnerability in processing of ad-hoc probe
-    requests (CVE-2009-0282) (closes: bug#512995)
-
- -- Ben Hutchings <ben at decadent.org.uk>  Wed, 28 Jan 2009 00:53:13 +0000
-
-rt73 (1:1.0.3.6-cvs20080623-dfsg1-2) unstable; urgency=low
-
-  * Include upstream changelog in module source tarball. Closes: #487658.
-  * Include other upstream docs in rt73-common.
-
- -- Ben Hutchings <ben at decadent.org.uk>  Mon, 23 Jun 2008 14:08:31 +0100
-
-rt73 (1:1.0.3.6-cvs20080623-dfsg1-1) unstable; urgency=low
-
-  * New CVS snapshot
-    - Fixes initialisation order on newer kernels. Closes: #468422.
-  * Recommends: firmware-ralink, replacing firmware-rt73.
-    Closes: #454920.
-  * Patch 000_if_name.diff removes bogus code for generating a unique
-    interface name.
-  * Use debhelper and m-a makefile to build modules, avoiding the need
-    to rebuild debian/rules. Closes: #464407.
-
- -- Ben Hutchings <ben at decadent.org.uk>  Mon, 23 Jun 2008 04:41:17 +0100
-
-rt73 (1:1.0.3.6-cvs20071123-dfsg1-3) unstable; urgency=low
-
-  * Fixed postinst script.
-  * Recommends: firmware-rt73.
-
- -- Piotr Roszatycki <dexter at debian.org>  Thu, 29 Nov 2007 15:31:22 +0100
-
-rt73 (1:1.0.3.6-cvs20071123-dfsg1-2) unstable; urgency=low
-
-  [ Piotr Roszatycki ]
-  * Really remove /lib/firmware/rt73.bin symlink. Closes: #451772.
-  * Fix deprecated udev rule. Closes: #451906.
-
-  [ Ben Hutchings ]
-  * Patch 001_fix_probe_148f_2573.diff rejects devices which require the
-    rt2570 driver.
-  * Patch 002_fix_probe_crash.diff fixes crash in case of device probe
-    failure.
-
- -- Piotr Roszatycki <dexter at debian.org>  Mon, 26 Nov 2007 19:28:24 +0100
-
-rt73 (1:1.0.3.6-cvs20071123-dfsg1-1) unstable; urgency=low
-
-  * New CVS snapshot.
-  * Put README.Debian in proper directory. Closes: #452646.
-
- -- Piotr Roszatycki <dexter at debian.org>  Sat, 24 Nov 2007 12:58:44 +0100
-
-rt73 (1:1.0.3.6-cvs20071114-dfsg1-1) unstable; urgency=low
-
-  * New CVS snapshot with removed non-free binary firmware. Closes: #449397.
-  * Maintaining by pkg-ralink Alioth project.
-  * Renamed compiled package to rt73-modules-KVERS.
-  * Recommends: rutilt
-  * Fixed postinst script and added preinst script. Closes: #450947.
-  * The /lib/firmware/rt73.bin symlink is created with update-rt73-firmware
-    script, so the package won't conflict with rt73-firmware package.
-  * Do not blacklist other drivers by default.
-  * Added udev rule for automatic ifconfig up.
-  * The README.Debian files synchronized with other pkg-ralink packages.
-  * The source file contains the tool for fetching the latest CVS snapshot.
-
- -- Piotr Roszatycki <dexter at debian.org>  Sat, 17 Nov 2007 02:12:00 +0100
-
-rt73 (1:1.0.3.6-cvs20071013-1) unstable; urgency=low
-
-  * Uploaded to unstable.
-  * Switched upstream to http://rt2x00.serialmonkey.com/ enhanced legacy
-    driver. Closes: #434341.
-    - Used original CVS snapshot without Debian patches.
-    - The upstream renamed interface from rausb* to wlan*.
-    - The driver does not read configuration file rt73sta.dat anymore.
-    - The firmware is stored in /etc/firmware and symlinked to /lib/firmware.
-  * Changed architecture to any. Closes: #441853.
-
- -- Piotr Roszatycki <dexter at debian.org>  Wed, 24 Oct 2007 13:29:54 +0200
-
-rt73 (1.0.4.0.dfsg1-1~experimental2) experimental; urgency=low
-
-  * Add architecture amd64.
-
- -- Piotr Roszatycki <dexter at debian.org>  Tue,  4 Sep 2007 17:41:04 +0200
-
-rt73 (1.0.4.0.dfsg1-1~experimental1) experimental; urgency=medium
-
-  * New upstream release:
-    - Does compile against the newest kernel. Closes: #424901.
-  * Fixed the update-rt73-firmware. Works with the new Ralink website.
-    Closes: #418116.
-  * Provided blacklist and alias for modprobe.
-  * Provided documentation for iwpriv options and rt73sta.dat configuration
-    file.
-
- -- Piotr Roszatycki <dexter at debian.org>  Fri, 13 Jul 2007 13:22:51 +0200
-
-rt73 (1.0.3.6.dfsg1-1~experimental1) experimental; urgency=low
-
-  * Initial release. Closes: #396648.
-  * Reuploaded after rejection.
-  * Removed WPA_Supplican and Module/Configure from upstream source.
-  * Reedited copyright file.
-  * Updated URLs.
-
- -- Piotr Roszatycki <dexter at debian.org>  Fri, 29 Dec 2006 14:39:28 +0100

Copied: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/changelog (from rev 178, unstable/rt73/debian/changelog)
===================================================================
--- tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/changelog	                        (rev 0)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/changelog	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,122 @@
+rt73 (1:1.0.3.6-cvs20080623-dfsg1-4) unstable; urgency=low
+
+  * Fix compatibility with kernel versions 2.6.27-2.6.29 (closes: bug#522912)
+  * Fix lookup of max USB packet size (closes: bug#516519)
+  * Move suggested modprobe configuration to README (closes: bug#518244)
+  * Update Standards-Version to 3.8.1:
+    - Add README.source
+  * Move to the new 'kernel' section
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 14 Apr 2009 01:16:40 +0100
+
+rt73 (1:1.0.3.6-cvs20080623-dfsg1-3) unstable; urgency=high
+
+  * Fixed buffer overflow vulnerability in processing of ad-hoc probe
+    requests (CVE-2009-0282) (closes: bug#512995)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 28 Jan 2009 00:53:13 +0000
+
+rt73 (1:1.0.3.6-cvs20080623-dfsg1-2) unstable; urgency=low
+
+  * Include upstream changelog in module source tarball. Closes: #487658.
+  * Include other upstream docs in rt73-common.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 23 Jun 2008 14:08:31 +0100
+
+rt73 (1:1.0.3.6-cvs20080623-dfsg1-1) unstable; urgency=low
+
+  * New CVS snapshot
+    - Fixes initialisation order on newer kernels. Closes: #468422.
+  * Recommends: firmware-ralink, replacing firmware-rt73.
+    Closes: #454920.
+  * Patch 000_if_name.diff removes bogus code for generating a unique
+    interface name.
+  * Use debhelper and m-a makefile to build modules, avoiding the need
+    to rebuild debian/rules. Closes: #464407.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 23 Jun 2008 04:41:17 +0100
+
+rt73 (1:1.0.3.6-cvs20071123-dfsg1-3) unstable; urgency=low
+
+  * Fixed postinst script.
+  * Recommends: firmware-rt73.
+
+ -- Piotr Roszatycki <dexter at debian.org>  Thu, 29 Nov 2007 15:31:22 +0100
+
+rt73 (1:1.0.3.6-cvs20071123-dfsg1-2) unstable; urgency=low
+
+  [ Piotr Roszatycki ]
+  * Really remove /lib/firmware/rt73.bin symlink. Closes: #451772.
+  * Fix deprecated udev rule. Closes: #451906.
+
+  [ Ben Hutchings ]
+  * Patch 001_fix_probe_148f_2573.diff rejects devices which require the
+    rt2570 driver.
+  * Patch 002_fix_probe_crash.diff fixes crash in case of device probe
+    failure.
+
+ -- Piotr Roszatycki <dexter at debian.org>  Mon, 26 Nov 2007 19:28:24 +0100
+
+rt73 (1:1.0.3.6-cvs20071123-dfsg1-1) unstable; urgency=low
+
+  * New CVS snapshot.
+  * Put README.Debian in proper directory. Closes: #452646.
+
+ -- Piotr Roszatycki <dexter at debian.org>  Sat, 24 Nov 2007 12:58:44 +0100
+
+rt73 (1:1.0.3.6-cvs20071114-dfsg1-1) unstable; urgency=low
+
+  * New CVS snapshot with removed non-free binary firmware. Closes: #449397.
+  * Maintaining by pkg-ralink Alioth project.
+  * Renamed compiled package to rt73-modules-KVERS.
+  * Recommends: rutilt
+  * Fixed postinst script and added preinst script. Closes: #450947.
+  * The /lib/firmware/rt73.bin symlink is created with update-rt73-firmware
+    script, so the package won't conflict with rt73-firmware package.
+  * Do not blacklist other drivers by default.
+  * Added udev rule for automatic ifconfig up.
+  * The README.Debian files synchronized with other pkg-ralink packages.
+  * The source file contains the tool for fetching the latest CVS snapshot.
+
+ -- Piotr Roszatycki <dexter at debian.org>  Sat, 17 Nov 2007 02:12:00 +0100
+
+rt73 (1:1.0.3.6-cvs20071013-1) unstable; urgency=low
+
+  * Uploaded to unstable.
+  * Switched upstream to http://rt2x00.serialmonkey.com/ enhanced legacy
+    driver. Closes: #434341.
+    - Used original CVS snapshot without Debian patches.
+    - The upstream renamed interface from rausb* to wlan*.
+    - The driver does not read configuration file rt73sta.dat anymore.
+    - The firmware is stored in /etc/firmware and symlinked to /lib/firmware.
+  * Changed architecture to any. Closes: #441853.
+
+ -- Piotr Roszatycki <dexter at debian.org>  Wed, 24 Oct 2007 13:29:54 +0200
+
+rt73 (1.0.4.0.dfsg1-1~experimental2) experimental; urgency=low
+
+  * Add architecture amd64.
+
+ -- Piotr Roszatycki <dexter at debian.org>  Tue,  4 Sep 2007 17:41:04 +0200
+
+rt73 (1.0.4.0.dfsg1-1~experimental1) experimental; urgency=medium
+
+  * New upstream release:
+    - Does compile against the newest kernel. Closes: #424901.
+  * Fixed the update-rt73-firmware. Works with the new Ralink website.
+    Closes: #418116.
+  * Provided blacklist and alias for modprobe.
+  * Provided documentation for iwpriv options and rt73sta.dat configuration
+    file.
+
+ -- Piotr Roszatycki <dexter at debian.org>  Fri, 13 Jul 2007 13:22:51 +0200
+
+rt73 (1.0.3.6.dfsg1-1~experimental1) experimental; urgency=low
+
+  * Initial release. Closes: #396648.
+  * Reuploaded after rejection.
+  * Removed WPA_Supplican and Module/Configure from upstream source.
+  * Reedited copyright file.
+  * Updated URLs.
+
+ -- Piotr Roszatycki <dexter at debian.org>  Fri, 29 Dec 2006 14:39:28 +0100

Deleted: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/conf/rt73.modprobe
===================================================================
--- unstable/rt73/debian/conf/rt73.modprobe	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/conf/rt73.modprobe	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,10 +0,0 @@
-# RT73 driver
-
-# Uncomment these entries to not load other drivers for the same device
-# blacklist prism2_usb
-# blacklist rt2500usb
-# blacklist rt2570
-# blacklist rt73usb
-
-# Alias for rausb0 interface
-# alias wlan0 rt73

Deleted: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/control.modules.in
===================================================================
--- unstable/rt73/debian/control.modules.in	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/control.modules.in	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,18 +0,0 @@
-Source: rt73
-Section: net
-Priority: extra
-Build-Depends: debhelper (>= 4.0.0)
-Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
-Uploaders: Piotr Roszatycki <dexter at debian.org>
-Standards-Version: 3.7.2
-Homepage: http://rt2x00.serialmonkey.com/
-
-Package: rt73-modules-_KVERS_
-Architecture: any
-Recommends: linux-image-_KVERS_, wireless-tools, firmware-ralink
-Suggests: rutilt
-Description: rt73 wireless network driver
- This package contains the rt73 driver for Linux _KVERS_.
- .
- This driver supports USB wireless network cards with the Ralink
- RT2501USB chipset.

Copied: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/control.modules.in (from rev 171, unstable/rt73/debian/control.modules.in)
===================================================================
--- tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/control.modules.in	                        (rev 0)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/control.modules.in	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,18 @@
+Source: rt73
+Section: kernel
+Priority: extra
+Build-Depends: debhelper (>= 4.0.0)
+Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
+Uploaders: Piotr Roszatycki <dexter at debian.org>
+Standards-Version: 3.7.2
+Homepage: http://rt2x00.serialmonkey.com/
+
+Package: rt73-modules-_KVERS_
+Architecture: any
+Recommends: linux-image-_KVERS_, wireless-tools, firmware-ralink
+Suggests: rutilt
+Description: rt73 wireless network driver
+ This package contains the rt73 driver for Linux _KVERS_.
+ .
+ This driver supports USB wireless network cards with the Ralink
+ RT2501USB chipset.

Deleted: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/packages
===================================================================
--- unstable/rt73/debian/packages	2009-01-28 01:05:58 UTC (rev 152)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/packages	2009-04-14 03:06:50 UTC (rev 180)
@@ -1,112 +0,0 @@
-# If the debian/rules or debian/control file is missing, rebuild the file:
-#
-#   $ yada rebuild control
-#   $ yada rebuild rules
-
-%define is_yada_bundled %`test -x debian/yada && echo 1`
-
-Source: rt73
-Section: contrib/net
-Priority: extra
-Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
-Uploaders: Piotr Roszatycki <dexter at debian.org>
-Standards-Version: 3.7.2
-Upstream-Source: http://rt2x00.serialmonkey.com/wiki/index.php?title=Downloads
-%if %`dpkg --compare-versions %{YADA_VERSION} ge 0.54 && echo 1`
-Homepage: http://rt2x00.serialmonkey.com/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ralink/unstable/rt73/trunk
-Vcs-Svn: svn://svn.debian.org/pkg-ralink/unstable/rt73/trunk
-%endif
-Patches: patches/*.diff
-Major-Changes:
-  * Patch 000_if_name.diff removes bogus code for generating a unique
-    interface name.
-  * Patch 001_fix_probe_148f_2573.diff rejects devices which require the
-    rt2570 driver.
-  * Patch 002_fix_probe_crash.diff fixes crash in case of device probe
-    failure.
-Description: RT73(RT2571W) Wireless Lan Linux Driver - kernel module sources
- This is a Linux device driver for Ralink RT73 a/b/g WLAN Card.
-Copyright: GPL
- RT2x00 SourceForge Project - http://rt2x00.serialmonkey.com
- .
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- Licensed under the GNU GPL
- Original code supplied under license from RaLink Inc, 2004.
-Build-Depends: bzip2
-%if %{!?is_yada_bundled:1}
-Build-Depends: yada
-%endif
-Build: bash
- rm -rf modules || true
- mkdir -p modules/rt73
- cp -a CHANGELOG Module/* modules/rt73
- chmod -x modules/rt73/*
- mkdir -p modules/rt73/debian
- cp -a debian/changelog debian/*.modules.in modules/rt73/debian/
- cp -a debian/rules.modules modules/rt73/debian/rules
- chmod a+rx modules/rt73/debian/rules
- cp -a debian/README.modules modules/rt73/debian/README
- tar jcf rt73.tar.bz2 modules
- eval pod2man $(grep '^# pod2man ' debian/scripts/update-rt73-firmware.sh | sed 's/^# pod2man //') \
-     debian/scripts/update-rt73-firmware.sh \
-     > debian/scripts/update-rt73-firmware.8
-Clean: bash
- rm -rf modules || true
- rm -f rt73.tar.bz2 || true
- rm -f debian/scripts/update-rt73-firmware.8
-
-Package: rt73-source
-Architecture: all
-Depends: module-assistant, bzip2, debhelper
-Recommends: rt73-common
-Recommends: firmware-ralink
-Recommends: wireless-tools
-Suggests: rutilt
-Description: RT73(RT2571W) Wireless Lan Linux Driver - kernel module sources
- This package contains source to be used with the kernel-package tools.
-Install: sh
- yada install -src rt73.tar.bz2
- yada symlink -into /usr/share/modass/overrides -as rt73 /usr/share/modass/packages/default.sh
- yada install -doc -as NEWS.Debian -gzip debian/NEWS
- yada install -doc -as changelog CHANGELOG
-
-Package: rt73-common
-Architecture: all
-Depends: wget, unzip, []
-Recommends: firmware-ralink
-Description: RT73(RT2571W) Wireless Lan Linux Driver - common files
- This package contains the configuration file for the driver and
- the update-rt73-firmware tool which downloads the firmware image file
- from http://www.ralinktech.com/ralink/Home/Support/Linux.html page.
-Install: sh
- yada install -dir /etc/firmware /lib/firmware
- yada install -sbin -script -as update-rt73-firmware debian/scripts/update-rt73-firmware.sh
- yada install -man debian/scripts/update-rt73-firmware.8
- yada install -conf -into /etc/modprobe.d -as rt73 debian/conf/rt73.modprobe
- yada install -conf -into /etc/udev/rules.d -as 85-rt73.rules debian/conf/rt73.rules
- yada install -doc FAQ THANKS README Module/iwpriv_usage.txt
- yada install -doc -as README.Debian debian/README
- yada install -doc -as NEWS.Debian -gzip debian/NEWS
- yada install -doc -as changelog CHANGELOG
-Postinst: sh
- if [ "$1" = "configure" ]; then
-     if [ ! -f /lib/firmware/rt73.bin ] && [ ! -h /lib/firmware/rt73.bin ] \
-     && [ ! -f /lib/firmware/`uname -r`/rt73.bin ]; then
-         echo "Warning: the rt73.ko driver is useless without rt73.bin firmware!"
-         echo "Please download the firmware with update-rt73-firmware command."
-         echo ""
-     fi
- fi
-Postrm: sh
- if [ "$1" = "purge" ]; then
-     if [ -h /lib/firmware/rt73.bin ]; then
-         rm -f /lib/firmware/rt73.bin || true
-     fi
-     rm -f /etc/firmware/rt73.bin || true
-     rmdir --ignore-fail-on-non-empty --parents /etc/firmware || true
- fi

Copied: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/packages (from rev 176, unstable/rt73/debian/packages)
===================================================================
--- tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/packages	                        (rev 0)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/packages	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,111 @@
+# If the debian/rules or debian/control file is missing, rebuild the file:
+#
+#   $ yada rebuild control
+#   $ yada rebuild rules
+
+%define is_yada_bundled %`test -x debian/yada && echo 1`
+
+Source: rt73
+Section: contrib/kernel
+Priority: extra
+Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
+Uploaders: Piotr Roszatycki <dexter at debian.org>
+Standards-Version: 3.8.1
+Upstream-Source: http://rt2x00.serialmonkey.com/wiki/index.php?title=Downloads
+%if %`dpkg --compare-versions %{YADA_VERSION} ge 0.54 && echo 1`
+Homepage: http://rt2x00.serialmonkey.com/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ralink/unstable/rt73/trunk
+Vcs-Svn: svn://svn.debian.org/pkg-ralink/unstable/rt73/trunk
+%endif
+Patches: patches/*.diff
+Major-Changes:
+  * Patch 000_if_name.diff removes bogus code for generating a unique
+    interface name.
+  * Patch 001_fix_probe_148f_2573.diff rejects devices which require the
+    rt2570 driver.
+  * Patch 002_fix_probe_crash.diff fixes crash in case of device probe
+    failure.
+Description: RT73(RT2571W) Wireless Lan Linux Driver - kernel module sources
+ This is a Linux device driver for Ralink RT73 a/b/g WLAN Card.
+Copyright: GPL
+ RT2x00 SourceForge Project - http://rt2x00.serialmonkey.com
+ .
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ Licensed under the GNU GPL
+ Original code supplied under license from RaLink Inc, 2004.
+Build-Depends: bzip2
+%if %{!?is_yada_bundled:1}
+Build-Depends: yada
+%endif
+Build: bash
+ rm -rf modules || true
+ mkdir -p modules/rt73
+ cp -a CHANGELOG Module/* modules/rt73
+ chmod -x modules/rt73/*
+ mkdir -p modules/rt73/debian
+ cp -a debian/changelog debian/*.modules.in modules/rt73/debian/
+ cp -a debian/rules.modules modules/rt73/debian/rules
+ chmod a+rx modules/rt73/debian/rules
+ cp -a debian/README.modules modules/rt73/debian/README
+ tar jcf rt73.tar.bz2 modules
+ eval pod2man $(grep '^# pod2man ' debian/scripts/update-rt73-firmware.sh | sed 's/^# pod2man //') \
+     debian/scripts/update-rt73-firmware.sh \
+     > debian/scripts/update-rt73-firmware.8
+Clean: bash
+ rm -rf modules || true
+ rm -f rt73.tar.bz2 || true
+ rm -f debian/scripts/update-rt73-firmware.8
+
+Package: rt73-source
+Architecture: all
+Depends: module-assistant, bzip2, debhelper
+Recommends: rt73-common
+Recommends: firmware-ralink
+Recommends: wireless-tools
+Suggests: rutilt
+Description: RT73(RT2571W) Wireless Lan Linux Driver - kernel module sources
+ This package contains source to be used with the kernel-package tools.
+Install: sh
+ yada install -src rt73.tar.bz2
+ yada symlink -into /usr/share/modass/overrides -as rt73 /usr/share/modass/packages/default.sh
+ yada install -doc -as NEWS.Debian -gzip debian/NEWS
+ yada install -doc -as changelog CHANGELOG
+
+Package: rt73-common
+Architecture: all
+Depends: wget, unzip, []
+Recommends: firmware-ralink
+Description: RT73(RT2571W) Wireless Lan Linux Driver - common files
+ This package contains the configuration file for the driver and
+ the update-rt73-firmware tool which downloads the firmware image file
+ from http://www.ralinktech.com/ralink/Home/Support/Linux.html page.
+Install: sh
+ yada install -dir /etc/firmware /lib/firmware
+ yada install -sbin -script -as update-rt73-firmware debian/scripts/update-rt73-firmware.sh
+ yada install -man debian/scripts/update-rt73-firmware.8
+ yada install -conf -into /etc/udev/rules.d -as 85-rt73.rules debian/conf/rt73.rules
+ yada install -doc FAQ THANKS README Module/iwpriv_usage.txt
+ yada install -doc -as README.Debian debian/README
+ yada install -doc -as NEWS.Debian -gzip debian/NEWS
+ yada install -doc -as changelog CHANGELOG
+Postinst: sh
+ if [ "$1" = "configure" ]; then
+     if [ ! -f /lib/firmware/rt73.bin ] && [ ! -h /lib/firmware/rt73.bin ] \
+     && [ ! -f /lib/firmware/`uname -r`/rt73.bin ]; then
+         echo "Warning: the rt73.ko driver is useless without rt73.bin firmware!"
+         echo "Please download the firmware with update-rt73-firmware command."
+         echo ""
+     fi
+ fi
+Postrm: sh
+ if [ "$1" = "purge" ]; then
+     if [ -h /lib/firmware/rt73.bin ]; then
+         rm -f /lib/firmware/rt73.bin || true
+     fi
+     rm -f /etc/firmware/rt73.bin || true
+     rmdir --ignore-fail-on-non-empty --parents /etc/firmware || true
+ fi

Copied: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/004_use_netdev_ml_priv.diff (from rev 173, unstable/rt73/debian/patches/004_use_netdev_ml_priv.diff)
===================================================================
--- tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/004_use_netdev_ml_priv.diff	                        (rev 0)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/004_use_netdev_ml_priv.diff	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,270 @@
+Use ml_priv to link private data to net_device (ml_priv was added in
+2.6.26 and priv was removed in 2.6.29).
+
+--- rt73-1.0.3.6-cvs20080623-dfsg1.orig/Module/rtmp_info.c
++++ rt73-1.0.3.6-cvs20080623-dfsg1/Module/rtmp_info.c
+@@ -177,7 +177,7 @@
+ 			struct iw_request_info *info,
+ 			struct iw_freq *freq, char *extra)
+ {
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 	int 	chan = -1;
+ 
+     //check if the interface is down
+@@ -208,7 +208,7 @@
+ 		   struct iw_request_info *info,
+ 		   struct iw_freq *freq, char *extra)
+ {
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 	ULONG	m;
+ 
+     //check if the interface is down
+@@ -228,7 +228,7 @@
+ 		   struct iw_request_info *info,
+ 		   __u32 *mode, char *extra)
+ {
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 
+     //check if the interface is down
+     if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -302,7 +302,7 @@
+ 		   struct iw_request_info *info,
+ 		   __u32 *mode, char *extra)
+ {
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 
+     //check if the interface is down
+     if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -330,7 +330,7 @@
+ 		   struct iw_request_info *info,
+ 		   char *name, char *extra)
+ {
+-    PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++    PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 
+     //check if the interface is down
+     if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -343,7 +343,7 @@
+ 		   struct iw_request_info *info,
+ 		   char *name, char *extra)
+ {
+-    PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++    PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 
+     //check if the interface is down
+     if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -356,7 +356,7 @@
+ 		   struct iw_request_info *info,
+ 		   struct iw_point *data, char *extra)
+ {
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 	struct iw_range *range = (struct iw_range *) extra;
+ 	u16 val;
+ 	int i, chan;
+@@ -462,7 +462,7 @@
+ 			  struct sockaddr *ap_addr, char *extra)
+ {
+ 
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 
+     //check if the interface is down
+     if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -540,7 +540,7 @@
+ 			struct iw_point *data, char *extra)
+ {
+ 
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 	struct sockaddr addr[IW_MAX_AP];
+ 	struct iw_quality qual[IW_MAX_AP];
+ 	int i;
+@@ -571,7 +571,7 @@
+ 			struct iw_point *data, char *extra)
+ {
+ 	ULONG								Now;
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 	int Status = NDIS_STATUS_SUCCESS;
+ 	//BOOLEAN		StateMachineTouched = FALSE;
+ 
+@@ -639,7 +639,7 @@
+ 			struct iw_point *data, char *extra)
+ {
+ 
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 	int i=2, j;
+ 	char *current_ev = extra, *previous_ev = extra;
+ 	char *end_buf = extra + IW_SCAN_MAX_DATA;   // some of platforms restricted on IW_SCAN_MAX_DATA
+@@ -878,7 +878,7 @@
+ 			 struct iw_point *data, char *essid)
+ {
+ 
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 	NDIS_802_11_SSID					Ssid, *pSsid=NULL;
+ 	ULONG		Length;
+ 
+@@ -945,7 +945,7 @@
+ 			 struct iw_point *data, char *essid)
+ {
+ 
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 
+     //check if the interface is down
+     if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -966,7 +966,7 @@
+ 			 struct iw_request_info *info,
+ 			 struct iw_point *data, char *nickname)
+ {
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 
+     //check if the interface is down
+     if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -986,7 +986,7 @@
+ 			 struct iw_request_info *info,
+ 			 struct iw_point *data, char *nickname)
+ {
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 
+     //check if the interface is down
+     if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -1003,7 +1003,7 @@
+ 			   struct iw_request_info *info,
+ 			   struct iw_param *rts, char *extra)
+ {
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 	u16 val;
+ 
+     //check if the interface is down
+@@ -1030,7 +1030,7 @@
+ 			   struct iw_request_info *info,
+ 			   struct iw_param *rts, char *extra)
+ {
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 
+     //check if the interface is down
+     if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -1047,7 +1047,7 @@
+ 			struct iw_request_info *info,
+ 			struct iw_param *rts, char *extra)
+ {
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 	u16 val;
+ 
+     //check if the interface is down
+@@ -1072,7 +1072,7 @@
+ 			struct iw_request_info *info,
+ 			struct iw_param *rts, char *extra)
+ {
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 
+     //check if the interface is down
+     if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -1089,7 +1089,7 @@
+ 			  struct iw_request_info *info,
+ 			  struct iw_point *erq, char *keybuf)
+ {
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 	union {
+ 		char buf[sizeof(NDIS_802_11_WEP)+MAX_LEN_OF_KEY- 1];
+ 		NDIS_802_11_WEP keyinfo;
+@@ -1204,7 +1204,7 @@
+ 			  struct iw_request_info *info,
+ 			  struct iw_point *erq, char *key)
+ {
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 	int kid;
+ 
+     //check if the interface is down
+@@ -1259,7 +1259,7 @@
+ rt_ioctl_setparam(struct net_device *dev, struct iw_request_info *info,
+ 			 void *w, char *extra)
+ {
+-	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++	PRTMP_ADAPTER pAdapter = dev->ml_priv;
+ 	struct rt_priv_support *PRTMP_PRIVATE_SET_PROC;
+ 	char *this_char = extra;
+ 	char *value;
+@@ -2846,7 +2846,7 @@
+ 	IN	OUT	struct ifreq	*rq,
+ 	IN	INT					cmd)
+ {
+-	RTMP_ADAPTER						*pAd = net_dev->priv;
++	RTMP_ADAPTER						*pAd = net_dev->ml_priv;
+ 	struct iwreq						*wrq = (struct iwreq *) rq;
+ 	struct iw_point 					*erq = NULL;
+ 	struct iw_freq						*frq = NULL;
+--- rt73-1.0.3.6-cvs20080623-dfsg1.orig/Module/rtmp_main.c
++++ rt73-1.0.3.6-cvs20080623-dfsg1/Module/rtmp_main.c
+@@ -133,7 +133,7 @@
+ struct net_device_stats *rt73_get_ether_stats(
+     IN  struct net_device *net_dev)
+ {
+-	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv;
++	PRTMP_ADAPTER pAd = net_dev->ml_priv;
+ 
+ 	DBGPRINT(RT_DEBUG_INFO, "rt73_get_ether_stats --->\n");
+ 
+@@ -195,7 +195,7 @@
+ struct iw_statistics *rt73_get_wireless_stats(
+ 	IN  struct net_device *net_dev)
+ {
+-	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv;
++	PRTMP_ADAPTER pAd = net_dev->ml_priv;
+ 
+ 	DBGPRINT(RT_DEBUG_TRACE, "rt73_get_wireless_stats --->\n");
+ 
+@@ -1648,7 +1648,7 @@
+ 
+ static int usb_rtusb_open(struct net_device *net_dev)
+ {
+-	PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) net_dev->priv;
++	PRTMP_ADAPTER   pAd = net_dev->ml_priv;
+ 	NDIS_STATUS     Status = NDIS_STATUS_SUCCESS;
+ 
+ 	DBGPRINT(RT_DEBUG_TRACE, "--> %s: driver version - %s\n",
+@@ -1715,7 +1715,7 @@
+ 
+ static int usb_rtusb_close(struct net_device *net_dev)
+ {
+-	PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) net_dev->priv;
++	PRTMP_ADAPTER   pAd = net_dev->ml_priv;
+ 
+ 	DECLARE_WAIT_QUEUE_HEAD (unlink_wakeup);
+ 	DECLARE_WAITQUEUE (wait, current);
+@@ -2193,7 +2193,7 @@
+ 		goto out_nonetdev;
+ 	}
+ 
+-	netdev->priv = pAd;
++	netdev->ml_priv = pAd;
+ 	pAd->pUsb_Dev = dev;
+ 
+ 	RTUSBReadMACRegister(pAd, MAC_CSR0, &version);
+--- rt73-1.0.3.6-cvs20080623-dfsg1.orig/Module/rtusb_data.c
++++ rt73-1.0.3.6-cvs20080623-dfsg1/Module/rtusb_data.c
+@@ -340,7 +340,7 @@
+ 	IN	struct sk_buff		*pSkb,
+ 	IN	struct net_device	*net_dev)
+ {
+-	PRTMP_ADAPTER	pAd = net_dev->priv;
++	PRTMP_ADAPTER	pAd = net_dev->ml_priv;
+ 	NDIS_STATUS 	Status = NDIS_STATUS_SUCCESS;
+ 	//INT 			Index;
+ 

Copied: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/005_use_kill_pid.diff (from rev 167, unstable/rt73/debian/patches/005_use_kill_pid.diff)
===================================================================
--- tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/005_use_kill_pid.diff	                        (rev 0)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/005_use_kill_pid.diff	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,24 @@
+kill_proc() was un-exported in 2.6.27 and later removed, so reimplement it
+using kill_pid().
+
+--- rt73-1.0.3.6-cvs20080623-dfsg1.orig/Module/rtmp_init.c
++++ rt73-1.0.3.6-cvs20080623-dfsg1/Module/rtmp_init.c
+@@ -42,6 +42,18 @@
+ #define RT_USB_ALLOC_URB(iso)	usb_alloc_urb(iso);
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
++int kill_proc(pid_t pid, int sig, int priv)
++{
++	int ret;
++
++	rcu_read_lock();
++	ret = kill_pid(find_vpid(pid), sig, priv);
++	rcu_read_unlock();
++	return ret;
++}
++#endif
++
+ UCHAR	 BIT8[] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
+ ULONG	 BIT32[] = {0x00000001, 0x00000002, 0x00000004, 0x00000008,
+ 					0x00000010, 0x00000020, 0x00000040, 0x00000080,

Copied: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/006_iwe_stream_update.diff (from rev 168, unstable/rt73/debian/patches/006_iwe_stream_update.diff)
===================================================================
--- tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/006_iwe_stream_update.diff	                        (rev 0)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/006_iwe_stream_update.diff	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,111 @@
+Pass the extra argument to iwe_stream_add_*() functions required from 2.6.27.
+Define wrapper macro for earlier kernel versions.
+
+--- rt73-1.0.3.6-cvs20080623-dfsg1.orig/Module/rtmp_info.c
++++ rt73-1.0.3.6-cvs20080623-dfsg1/Module/rtmp_info.c
+@@ -49,6 +49,15 @@
+ #define IW_ESSID_MAX_SIZE	32
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
++#define iwe_stream_add_event(info, stream, ends, iwe, event_len)	\
++	iwe_stream_add_event(stream, ends, iwe, event_len)
++#define iwe_stream_add_point(info, stream, ends, iwe, extra)		\
++	iwe_stream_add_point(stream, ends, iwe, extra)
++#define iwe_stream_add_value(info, event, value, ends, iwe, event_len)	\
++	iwe_stream_add_value(event, value, ends, iwe, event_len)
++#endif
++
+ extern UCHAR	CipherWpa2Template[];
+ extern UCHAR	CipherWpa2TemplateLen;
+ extern UCHAR	CipherWpaPskTkip[];
+@@ -679,7 +688,7 @@
+         memcpy(iwe.u.ap_addr.sa_data, &pAdapter->ScanTab.BssEntry[i].Bssid, ETH_ALEN);
+ 
+         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)
+             break;
+ 
+@@ -691,7 +700,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)
+             break;
+ 
+@@ -714,7 +723,7 @@
+ 		iwe.len = IW_EV_UINT_LEN;
+ 
+         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)
+             break;
+ 
+@@ -730,7 +739,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)
+             break;
+ 
+@@ -744,7 +753,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[(iwe.u.data.flags & IW_ENCODE_INDEX)-1].Key);
++        current_ev = iwe_stream_add_point(info, current_ev, end_buf,&iwe,  (char *)pAdapter->SharedKey[(iwe.u.data.flags & IW_ENCODE_INDEX)-1].Key);
+         if (current_ev == previous_ev)
+             break;
+ 
+@@ -759,7 +768,7 @@
+ 		{
+ 			iwe.u.bitrate.value = RateIdToMbps[pAdapter->ScanTab.BssEntry[i].SupRate[i]/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);
+ 		}
+@@ -814,7 +823,7 @@
+ 		}
+ 		iwe.u.bitrate.value = max_rate * 500000;
+ 		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);
+ 		if((current_val-current_ev)>IW_EV_LCP_LEN)
+@@ -830,7 +839,7 @@
+ 		if (iwe.u.data.length)
+ 		{
+ 		    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)
+                 break;
+         }
+@@ -841,7 +850,7 @@
+ 		set_quality(pAdapter, &iwe.u.qual, pAdapter->ScanTab.BssEntry[i].Rssi);
+ 
+ 		previous_ev = current_ev;
+-		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)
+             break;
+ 
+@@ -856,7 +865,7 @@
+ 		if (iwe.u.data.length)
+ 		{
+ 		    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)
+                 break;
+         }

Copied: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/007_fix_max_usb_packet_size.diff (from rev 174, unstable/rt73/debian/patches/007_fix_max_usb_packet_size.diff)
===================================================================
--- tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/007_fix_max_usb_packet_size.diff	                        (rev 0)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/007_fix_max_usb_packet_size.diff	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,14 @@
+Fix lookup of max USB packet size (closes: bug#516519)
+
+--- rt73-1.0.3.6-cvs20080623-dfsg1.orig/Module/rtmp_main.c
++++ rt73-1.0.3.6-cvs20080623-dfsg1/Module/rtmp_main.c
+@@ -2251,7 +2251,8 @@
+         endpoint = &iface_desc->endpoint[i].desc;
+ 
+         /* get Max Packet Size from endpoint */
+-        pAd->BulkOutMaxPacketSize = (USHORT)endpoint->wMaxPacketSize;
++        pAd->BulkOutMaxPacketSize =
++	    usb_maxpacket(dev, usb_sndbulkpipe(dev, 1), true);
+         DBGPRINT(RT_DEBUG_TRACE, "BulkOutMaxPacketSize  %d\n", pAd->BulkOutMaxPacketSize);
+ 
+ 	}

Copied: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/series (from rev 174, unstable/rt73/debian/patches/series)
===================================================================
--- tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/series	                        (rev 0)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-4/debian/patches/series	2009-04-14 03:06:50 UTC (rev 180)
@@ -0,0 +1,8 @@
+000_if_name.diff
+001_fix_probe_148f_2573.diff
+002_fix_probe_crash.diff
+003_fix_probe_request_overflow.diff
+004_use_netdev_ml_priv.diff
+005_use_kill_pid.diff
+006_iwe_stream_update.diff
+007_fix_max_usb_packet_size.diff




More information about the Pkg-ralink-commits mailing list