r137 - in tags: . rt2400-1.2.2+cvs20080623-1/debian rt2400-1.2.2+cvs20080623-1/debian/patches rt2500-1.1.0-b4+cvs20080623-1/debian rt2500-1.1.0-b4+cvs20080623-1/debian/patches rt2570-1.1.0+cvs20080623-1/debian rt2570-1.1.0+cvs20080623-1/debian/patches rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/patches
benh at alioth.debian.org
benh at alioth.debian.org
Mon Jun 23 04:07:27 UTC 2008
Author: benh
Date: 2008-06-23 04:07:26 +0000 (Mon, 23 Jun 2008)
New Revision: 137
Added:
tags/rt2400-1.2.2+cvs20080623-1/
tags/rt2400-1.2.2+cvs20080623-1/debian/changelog
tags/rt2400-1.2.2+cvs20080623-1/debian/patches/000_if_name.diff
tags/rt2400-1.2.2+cvs20080623-1/debian/patches/series
tags/rt2500-1.1.0-b4+cvs20080623-1/
tags/rt2500-1.1.0-b4+cvs20080623-1/debian/changelog
tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/000_if_name.diff
tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/005_fix_error_rate_vars.diff
tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/series
tags/rt2570-1.1.0+cvs20080623-1/
tags/rt2570-1.1.0+cvs20080623-1/debian/changelog
tags/rt2570-1.1.0+cvs20080623-1/debian/patches/000_if_name.diff
tags/rt2570-1.1.0+cvs20080623-1/debian/patches/005_fix_delays.diff
tags/rt2570-1.1.0+cvs20080623-1/debian/patches/006_fix_probe_148f_2573.diff
tags/rt2570-1.1.0+cvs20080623-1/debian/patches/series
tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/
tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/changelog
tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/control.modules.in
tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/packages
tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/patches/000_if_name.diff
tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/patches/001_fix_probe_148f_2573.diff
tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/patches/002_fix_probe_crash.diff
tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/rules.modules
Removed:
tags/rt2400-1.2.2+cvs20080623-1/debian/changelog
tags/rt2400-1.2.2+cvs20080623-1/debian/patches/000_if_name.diff
tags/rt2400-1.2.2+cvs20080623-1/debian/patches/004_fix_mlme_queue_locking.diff
tags/rt2400-1.2.2+cvs20080623-1/debian/patches/series
tags/rt2500-1.1.0-b4+cvs20080623-1/debian/changelog
tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/000_if_name.diff
tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/004_fix_mlme_queue_locking.diff
tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/005_fix_error_rate_vars.diff
tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/006_2.6.24.diff
tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/series
tags/rt2570-1.1.0+cvs20080623-1/debian/changelog
tags/rt2570-1.1.0+cvs20080623-1/debian/patches/000_if_name.diff
tags/rt2570-1.1.0+cvs20080623-1/debian/patches/004_fix_mlme_queue_locking.diff
tags/rt2570-1.1.0+cvs20080623-1/debian/patches/005_fix_delays.diff
tags/rt2570-1.1.0+cvs20080623-1/debian/patches/006_fix_probe_148f_2573.diff
tags/rt2570-1.1.0+cvs20080623-1/debian/patches/series
tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/changelog
tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/modules.packages
tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/packages
tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/patches/001_fix_probe_148f_2573.diff
tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/patches/002_fix_probe_crash.diff
Log:
Tagged packages from today's CVS snapshot.
Copied: tags/rt2400-1.2.2+cvs20080623-1 (from rev 124, unstable/rt2400)
Deleted: tags/rt2400-1.2.2+cvs20080623-1/debian/changelog
===================================================================
--- unstable/rt2400/debian/changelog 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt2400-1.2.2+cvs20080623-1/debian/changelog 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,213 +0,0 @@
-rt2400 (1.2.2+cvs20070911-2) unstable; urgency=low
-
- [Ben Hutchings]
- * Copied recommendations and suggestions from modules packages to
- rt2400-source to make them more visible
-
- --
-
-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-1/debian/changelog (from rev 126, unstable/rt2400/debian/changelog)
===================================================================
--- tags/rt2400-1.2.2+cvs20080623-1/debian/changelog (rev 0)
+++ tags/rt2400-1.2.2+cvs20080623-1/debian/changelog 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1,216 @@
+rt2400 (1.2.2+cvs20080623-1) unstable; urgency=low
+
+ * New CVS snapshot
+ - Fixes compile error with Linux 2.6.24 and later
+ - Obsoletes 004_fix_mlme_queue_locking.diff
+ * Copied recommendations and suggestions from modules packages to
+ rt2400-source to make them more visible
+ * Modified 000_if_name.diff to apply at -p1 (closes: bug#485258)
+
+ -- 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-1/debian/patches/000_if_name.diff
===================================================================
--- unstable/rt2400/debian/patches/000_if_name.diff 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt2400-1.2.2+cvs20080623-1/debian/patches/000_if_name.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,31 +0,0 @@
---- Module/rtmp_main.c.orig
-+++ 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-1/debian/patches/000_if_name.diff (from rev 125, unstable/rt2400/debian/patches/000_if_name.diff)
===================================================================
--- tags/rt2400-1.2.2+cvs20080623-1/debian/patches/000_if_name.diff (rev 0)
+++ tags/rt2400-1.2.2+cvs20080623-1/debian/patches/000_if_name.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1,31 @@
+--- 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);
+
Deleted: tags/rt2400-1.2.2+cvs20080623-1/debian/patches/004_fix_mlme_queue_locking.diff
===================================================================
--- unstable/rt2400/debian/patches/004_fix_mlme_queue_locking.diff 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt2400-1.2.2+cvs20080623-1/debian/patches/004_fix_mlme_queue_locking.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,217 +0,0 @@
---- rt2400.orig/Module/mlme.c
-+++ rt2400/Module/mlme.c
-@@ -39,6 +39,8 @@
- #include "rt_config.h"
- #include <stdarg.h>
-
-+#include <asm/system.h>
-+
- /*
- ==========================================================================
- Description:
-@@ -58,7 +60,6 @@
- do
- {
- pAd->Mlme.Running = FALSE;
-- spin_lock_init(&pAd->Mlme.TaskLock);
-
- // initialize the two tables
- // MacTableInit(pAd);
-@@ -131,32 +132,28 @@
- {
- MLME_QUEUE_ELEM *Elem = NULL;
-
-- // Only accept MLME and Frame from peer side, no other (control/data) frame should
-- // get into this state machine
-+ // Only accept MLME and Frame from peer side, no other (control/data)
-+ // frame should get into this state machine
-
-- spin_lock(&pAd->Mlme.TaskLock);
-+ // We fix the multiple context service drop problem identified by
-+ // Ben Hutchings in an SMP- safe way by combining TaskLock and Queue.Lock
-+ // per his suggestion.
-+ spin_lock(&pAd->Mlme.Queue.Lock);
- if(pAd->Mlme.Running)
- {
-- spin_unlock(&pAd->Mlme.TaskLock);
-+ spin_unlock(&pAd->Mlme.Queue.Lock);
- return;
- }
-- else
-- {
-- pAd->Mlme.Running = TRUE;
-- }
-- spin_unlock(&pAd->Mlme.TaskLock);
-+ pAd->Mlme.Running = TRUE;
-+
-+ while (MlmeGetHead(&pAd->Mlme.Queue, &Elem)) {
-+ smp_read_barrier_depends();
-+ if (!Elem->Occupied) break;
-
-- while (TRUE) {
-- spin_lock(&pAd->Mlme.Queue.Lock);
-- if (!MlmeDequeue(&pAd->Mlme.Queue, &Elem)) {
-- spin_unlock(&pAd->Mlme.Queue.Lock);
-- break;
-- }
- spin_unlock(&pAd->Mlme.Queue.Lock);
-- if (pAd->PortCfg.BssType == BSS_MONITOR)
-- continue;
-+
- // From message type, determine which state machine I should drive
-- switch (Elem->Machine) {
-+ if (pAd->PortCfg.BssType != BSS_MONITOR) switch (Elem->Machine) {
- case ASSOC_STATE_MACHINE:
- StateMachinePerformAction(pAd, &pAd->Mlme.AssocMachine, Elem);
- break;
-@@ -173,18 +170,19 @@
- MlmeCntlMachinePerformAction(pAd, &pAd->Mlme.CntlMachine, Elem);
- break;
- default:
-- DBGPRINT(RT_DEBUG_TRACE, "ERROR: Illegal machine in MlmeHandler()\n");
-+ DBGPRINT(RT_DEBUG_ERROR,
-+ "ERROR: Illegal machine in MlmeHandler()\n");
- break;
- } // end of switch
-
- // free MLME element
-- Elem->Occupied = FALSE;
-- Elem->MsgLen = 0;
-+ smp_mb();
-+ Elem->Occupied = FALSE; // sic - bb
-+ spin_lock(&pAd->Mlme.Queue.Lock);
-+ MlmeDequeue(&pAd->Mlme.Queue);
- }
--
-- spin_lock(&pAd->Mlme.TaskLock);
- pAd->Mlme.Running = FALSE;
-- spin_unlock(&pAd->Mlme.TaskLock);
-+ spin_unlock(&pAd->Mlme.Queue.Lock);
- }
-
- /*
-@@ -229,7 +227,6 @@
- StateMachineDestroy(&pAd->Mlme.AuthRspMachine);
- StateMachineDestroy(&pAd->Mlme.SyncMachine);
- // StateMachineDestroy(&pAd->Mlme.CntlMachine);
--// spin_unlock(&pAd->Mlme.TaskLock);
- // NdisFreeSpinLock(&pAd->PortCfg.MacTab.Lock);
-
- // Cancel pending timers
-@@ -1392,17 +1389,31 @@
- printk(KERN_ERR DRV_NAME ": MlmeEnqueue full, msg dropped and may corrupt MLME\n");
- return FALSE;
- }
-+ // If another context preempts us, it uses the next element - sic. bb
- Tail = Queue->Tail++;
- Queue->Tail %= MAX_LEN_OF_MLME_QUEUE;
- Queue->Num++;
-+
-+ // We guard against Ben Hutchings' incomplete queue element problem by not
-+ // setting the Occupied flag until the memcpy is done. The ocurrence of a
-+ // refresh cycle during a copy can stretch the time by up to 100 usec
-+ // (well, quite a few usec, anyway); not good when interrupts are disabled.
-+ // Note that this can leave a bubble in the queue, but it will have
-+ // disappeared by the time this thread gets around to calling MlmeHandler.
-+ // All items will be handled in their proper order, but possibly not in the
-+ // context in which they were added. - bb
- spin_unlock(&Queue->Lock);
- DBGPRINT(RT_DEBUG_INFO, "MlmeEnqueue, num=%d\n", Queue->Num);
-
-- Queue->Entry[Tail].Occupied = TRUE;
- Queue->Entry[Tail].Machine = Machine;
- Queue->Entry[Tail].MsgType = MsgType;
- Queue->Entry[Tail].MsgLen = MsgLen;
- memcpy(Queue->Entry[Tail].Msg, Msg, MsgLen);
-+
-+ //MlmeHandler will stop when it finds this false.
-+ smp_wmb();
-+ Queue->Entry[Tail].Occupied = TRUE;
-+
- return TRUE;
- }
-
-@@ -1449,7 +1460,7 @@
- DBGPRINT(RT_DEBUG_INFO, "MlmeEnqueueForRecv, num=%d\n",Queue->Num);
-
- // OK, we got all the informations, it is time to put things into queue
-- Queue->Entry[Tail].Occupied = TRUE;
-+ // See MlmeEnqueue note for use of Occupied flag.
- Queue->Entry[Tail].Machine = Machine;
- Queue->Entry[Tail].MsgType = MsgType;
- Queue->Entry[Tail].MsgLen = MsgLen;
-@@ -1458,13 +1469,15 @@
- Queue->Entry[Tail].TimeStamp = jiffies;
- Queue->Entry[Tail].Rssi = Rssi;
- memcpy(Queue->Entry[Tail].Msg, Msg, MsgLen);
-+ smp_wmb();
-+ Queue->Entry[Tail].Occupied = TRUE;
-
- MlmeHandler(pAd);
-
- return TRUE;
- }
-
--/*! \brief Dequeue a message from the MLME Queue
-+/*! \brief Get the first message from the MLME Queue
- * WARNING: Must be call with Mlme.Queue.Lock held
- * \param *Queue The MLME Queue
- * \param *Elem The message dequeued from MLME Queue
-@@ -1472,14 +1485,29 @@
- * \pre
- * \post
- */
--BOOLEAN MlmeDequeue(
-+BOOLEAN MlmeGetHead(
- IN MLME_QUEUE *Queue,
- OUT MLME_QUEUE_ELEM **Elem)
- {
- if (Queue->Num == 0)
- return FALSE;
-- *Elem = &Queue->Entry[Queue->Head++];
-- Queue->Head %= MAX_LEN_OF_MLME_QUEUE;
-+ *Elem = &Queue->Entry[Queue->Head];
-+ return TRUE;
-+}
-+
-+/*! \brief Remove the first message from the MLME Queue
-+ * WARNING: Must be call with Mlme.Queue.Lock held
-+ * \param *Queue The MLME Queue
-+ * \return TRUE if a message was removed, FALSE if the queue was empty
-+ * \pre
-+ * \post
-+ */
-+BOOLEAN MlmeDequeue(
-+ IN MLME_QUEUE *Queue)
-+{
-+ if (Queue->Num == 0)
-+ return FALSE;
-+ Queue->Head = (Queue->Head + 1) % MAX_LEN_OF_MLME_QUEUE;
- Queue->Num--;
- DBGPRINT(RT_DEBUG_INFO, "MlmeDequeue, num=%d\n",Queue->Num);
-
---- rt2400.orig/Module/rtmp.h
-+++ rt2400/Module/rtmp.h
-@@ -596,7 +596,6 @@
- ULONG RxPER; // 0..100 %
-
- BOOLEAN Running;
-- spinlock_t TaskLock;
- MLME_QUEUE Queue;
-
- UINT ShiftReg;
-@@ -1287,10 +1286,13 @@
- IN ULONG MsgLen,
- IN VOID *Msg);
-
--BOOLEAN MlmeDequeue(
-+BOOLEAN MlmeGetHead(
- IN MLME_QUEUE *Queue,
- OUT MLME_QUEUE_ELEM **Elem);
-
-+BOOLEAN MlmeDequeue(
-+ IN MLME_QUEUE *Queue);
-+
- BOOLEAN MsgTypeSubst(
- IN MACFRAME *Fr,
- OUT INT *Machine,
Deleted: tags/rt2400-1.2.2+cvs20080623-1/debian/patches/series
===================================================================
--- unstable/rt2400/debian/patches/series 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt2400-1.2.2+cvs20080623-1/debian/patches/series 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,2 +0,0 @@
-000_if_name.diff -p0
-004_fix_mlme_queue_locking.diff
Copied: tags/rt2400-1.2.2+cvs20080623-1/debian/patches/series (from rev 126, unstable/rt2400/debian/patches/series)
===================================================================
--- tags/rt2400-1.2.2+cvs20080623-1/debian/patches/series (rev 0)
+++ tags/rt2400-1.2.2+cvs20080623-1/debian/patches/series 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1 @@
+000_if_name.diff
Copied: tags/rt2500-1.1.0-b4+cvs20080623-1 (from rev 124, unstable/rt2500)
Deleted: tags/rt2500-1.1.0-b4+cvs20080623-1/debian/changelog
===================================================================
--- unstable/rt2500/debian/changelog 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt2500-1.1.0-b4+cvs20080623-1/debian/changelog 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,237 +0,0 @@
-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.0-b4+cvs20080623-1/debian/changelog (from rev 129, unstable/rt2500/debian/changelog)
===================================================================
--- tags/rt2500-1.1.0-b4+cvs20080623-1/debian/changelog (rev 0)
+++ tags/rt2500-1.1.0-b4+cvs20080623-1/debian/changelog 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1,245 @@
+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.0-b4+cvs20080623-1/debian/patches/000_if_name.diff
===================================================================
--- unstable/rt2500/debian/patches/000_if_name.diff 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/000_if_name.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,31 +0,0 @@
---- Module/rtmp_main.c.orig
-+++ 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.0-b4+cvs20080623-1/debian/patches/000_if_name.diff (from rev 129, unstable/rt2500/debian/patches/000_if_name.diff)
===================================================================
--- tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/000_if_name.diff (rev 0)
+++ tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/000_if_name.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1,31 @@
+--- 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.0-b4+cvs20080623-1/debian/patches/004_fix_mlme_queue_locking.diff
===================================================================
--- unstable/rt2500/debian/patches/004_fix_mlme_queue_locking.diff 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/004_fix_mlme_queue_locking.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,255 +0,0 @@
---- rt2500.orig/Module/mlme.c
-+++ rt2500/Module/mlme.c
-@@ -289,7 +289,6 @@
- do
- {
- pAd->Mlme.Running = FALSE;
-- spin_lock_init(&pAd->Mlme.TaskLock);
-
- // initialize the two tables
- // MacTableInit(pAd);
-@@ -356,34 +355,29 @@
- MLME_QUEUE_ELEM *Elem = NULL;
- unsigned long flags;
-
-- // Only accept MLME and Frame from peer side, no other (control/data) frame should
-- // get into this state machine
-+ // Only accept MLME and Frame from peer side, no other (control/data)
-+ // frame should get into this state machine
-
-- spin_lock_irqsave(&pAd->Mlme.TaskLock, flags);
-+ // We fix the multiple context service drop problem identified by
-+ // Ben Hutchings in an SMP- safe way by combining TaskLock and Queue.Lock
-+ // per his suggestion.
-+ spin_lock_irqsave(&pAd->Mlme.Queue.Lock, flags);
- if(pAd->Mlme.Running)
- {
-- spin_unlock_irqrestore(&pAd->Mlme.TaskLock, flags);
-+ spin_unlock_irqrestore(&pAd->Mlme.Queue.Lock, flags);
- return;
- }
-- else
-- {
-- pAd->Mlme.Running = TRUE;
-- }
-- spin_unlock_irqrestore(&pAd->Mlme.TaskLock, flags);
-+ pAd->Mlme.Running = TRUE;
-
-- while (TRUE) {
-- spin_lock_irqsave(&pAd->Mlme.Queue.Lock, flags);
-- if (!MlmeDequeue(&pAd->Mlme.Queue, &Elem)) {
-- spin_unlock_irqrestore(&pAd->Mlme.Queue.Lock, flags);
-- break;
-- }
-- spin_unlock_irqrestore(&pAd->Mlme.Queue.Lock, flags);
-+ // If there's a bubble, wait for it to collapse before proceeding.
-+ while (MlmeGetHead(&pAd->Mlme.Queue, &Elem)) {
-+ smp_read_barrier_depends();
-+ if (!Elem->Occupied) break;
-
-- if (pAd->PortCfg.BssType == BSS_MONITOR)
-- continue;
-+ spin_unlock_irqrestore(&pAd->Mlme.Queue.Lock, flags);
-
- //From message type, determine which state machine I should drive
-- switch (Elem->Machine)
-+ if (pAd->PortCfg.BssType != BSS_MONITOR) switch (Elem->Machine)
- {
- case ASSOC_STATE_MACHINE:
- StateMachinePerformAction(pAd, &pAd->Mlme.AssocMachine, Elem);
-@@ -404,18 +398,19 @@
- StateMachinePerformAction(pAd, &pAd->Mlme.WpaPskMachine, Elem);
- break;
- default:
-- DBGPRINT(RT_DEBUG_TRACE, "ERROR: Illegal machine in MlmeHandler()\n");
-+ DBGPRINT(RT_DEBUG_ERROR,
-+ "ERROR: Illegal machine in MlmeHandler()\n");
- break;
- } // end of switch
-
- // free MLME element
-- Elem->Occupied = FALSE;
-- Elem->MsgLen = 0;
-+ smp_mb();
-+ Elem->Occupied = FALSE; // sic - bb
-+ spin_lock_irqsave(&pAd->Mlme.Queue.Lock, flags);
-+ MlmeDequeue(&pAd->Mlme.Queue);
- }
--
-- spin_lock_irqsave(&pAd->Mlme.TaskLock,flags);
- pAd->Mlme.Running = FALSE;
-- spin_unlock_irqrestore(&pAd->Mlme.TaskLock,flags);
-+ spin_unlock_irqrestore(&pAd->Mlme.Queue.Lock,flags);
- }
-
- /*
-@@ -491,7 +486,6 @@
- StateMachineDestroy(&pAd->Mlme.SyncMachine);
- // StateMachineDestroy(&pAd->Mlme.CntlMachine);
- //NdisFreeSpinLock(&pAd->Mlme.Queue.Lock);
-- //NdisFreeSpinLock(&pAd->Mlme.TaskLock);
- // NdisFreeSpinLock(&pAd->PortCfg.MacTab.Lock);
-
- MlmeFreeMemoryHandler(pAd); //Free MLME memory handler
-@@ -2341,18 +2335,32 @@
- printk(KERN_ERR DRV_NAME "MlmeEnqueue full, msg dropped and may corrupt MLME\n");
- return FALSE;
- }
-+ // If another context preempts us, it uses the next element - sic. bb
- Tail = Queue->Tail++;
- Queue->Tail %= MAX_LEN_OF_MLME_QUEUE;
- Queue->Num++;
-+
-+ // We guard against Ben Hutchings' incomplete queue element problem by not
-+ // setting the Occupied flag until the memcpy is done. The ocurrence of a
-+ // refresh cycle during a copy can stretch the time by up to 100 usec
-+ // (well, quite a few usec, anyway); not good when interrupts are disabled.
-+ // Note that this can leave a bubble in the queue, but it will have
-+ // disappeared by the time this thread gets around to calling MlmeHandler.
-+ // All items will be handled in their proper order, but possibly not in the
-+ // context in which they were added. - bb
- spin_unlock_irqrestore(&Queue->Lock, flags);
- DBGPRINT(RT_DEBUG_INFO, "MlmeEnqueue, num=%d\n",Queue->Num);
-
-- Queue->Entry[Tail].Occupied = TRUE;
- Queue->Entry[Tail].Machine = Machine;
- Queue->Entry[Tail].MsgType = MsgType;
- Queue->Entry[Tail].MsgLen = MsgLen;
- if (Msg != NULL)
- memcpy(Queue->Entry[Tail].Msg, Msg, MsgLen);
-+
-+ //MlmeHandler will stop when it finds this false.
-+ smp_wmb();
-+ Queue->Entry[Tail].Occupied = TRUE;
-+
- return TRUE;
- }
-
-@@ -2409,7 +2417,7 @@
- DBGPRINT(RT_DEBUG_INFO, "MlmeEnqueueForRecv, num=%d\n",Queue->Num);
-
- // OK, we got all the informations, it is time to put things into queue
-- Queue->Entry[Tail].Occupied = TRUE;
-+ // See MlmeEnqueue note for use of Occupied flag.
- Queue->Entry[Tail].Machine = Machine;
- Queue->Entry[Tail].MsgType = MsgType;
- Queue->Entry[Tail].MsgLen = MsgLen;
-@@ -2419,13 +2427,15 @@
- Queue->Entry[Tail].Noise = (Noise > BBP_R17_DYNAMIC_UP_BOUND) ? BBP_R17_DYNAMIC_UP_BOUND : ((ULONG) Noise);
- if (Msg != NULL)
- memcpy(Queue->Entry[Tail].Msg, Msg, MsgLen);
-+ smp_wmb();
-+ Queue->Entry[Tail].Occupied = TRUE;
-
- MlmeHandler(pAd);
-
- return TRUE;
- }
-
--/*! \brief Dequeue a message from the MLME Queue
-+/*! \brief Get the first message from the MLME Queue
- * WARNING: Must be call with Mlme.Queue.Lock held
- * \param *Queue The MLME Queue
- * \param *Elem The message dequeued from MLME Queue
-@@ -2433,14 +2443,29 @@
- * \pre
- * \post
- */
--BOOLEAN MlmeDequeue(
-+BOOLEAN MlmeGetHead(
- IN MLME_QUEUE *Queue,
- OUT MLME_QUEUE_ELEM **Elem)
- {
- if (Queue->Num == 0)
- return FALSE;
-- *Elem = &Queue->Entry[Queue->Head++];
-- Queue->Head %= MAX_LEN_OF_MLME_QUEUE;
-+ *Elem = &Queue->Entry[Queue->Head];
-+ return TRUE;
-+}
-+
-+/*! \brief Remove the first message from the MLME Queue
-+ * WARNING: Must be call with Mlme.Queue.Lock held
-+ * \param *Queue The MLME Queue
-+ * \return TRUE if a message was removed, FALSE if the queue was empty
-+ * \pre
-+ * \post
-+ */
-+BOOLEAN MlmeDequeue(
-+ IN MLME_QUEUE *Queue)
-+{
-+ if (Queue->Num == 0)
-+ return FALSE;
-+ Queue->Head = (Queue->Head + 1) % MAX_LEN_OF_MLME_QUEUE;
- Queue->Num--;
- DBGPRINT(RT_DEBUG_INFO, "MlmeDequeue, num=%d\n",Queue->Num);
-
-@@ -2460,25 +2485,24 @@
- // Continue the reset procedure...
- }
-
-- spin_lock_irqsave(&pAd->Mlme.TaskLock, flags);
-+ spin_lock_irqsave(&pAd->Mlme.Queue.Lock, flags);
- if(pAd->Mlme.Running)
- {
-- spin_unlock_irqrestore(&pAd->Mlme.TaskLock, flags);
-+ spin_unlock_irqrestore(&pAd->Mlme.Queue.Lock, flags);
- return;
- }
- else
- {
- pAd->Mlme.Running = TRUE;
- }
-- spin_unlock_irqrestore(&pAd->Mlme.TaskLock, flags);
-+ spin_unlock_irqrestore(&pAd->Mlme.Queue.Lock, flags);
-
- // Remove all Mlme queues elements
- spin_lock_irqsave(&pAd->Mlme.Queue.Lock, flags);
-- while (MlmeDequeue(&pAd->Mlme.Queue, &Elem)) {
-- // free MLME element
-+ while (MlmeGetHead(&pAd->Mlme.Queue, &Elem)) {
-+ MlmeDequeue(&pAd->Mlme.Queue);
- Elem->Occupied = FALSE;
-- Elem->MsgLen = 0;
-- }
-+ }
- spin_unlock_irqrestore(&pAd->Mlme.Queue.Lock, flags);
-
- // Cancel all timer events
-@@ -2507,9 +2531,9 @@
- pAd->Mlme.SyncMachine.CurrState = SYNC_IDLE;
-
- // Remove running state
-- spin_lock_irqsave(&pAd->Mlme.TaskLock, flags);
-+ spin_lock_irqsave(&pAd->Mlme.Queue.Lock, flags);
- pAd->Mlme.Running = FALSE;
-- spin_unlock_irqrestore(&pAd->Mlme.TaskLock, flags);
-+ spin_unlock_irqrestore(&pAd->Mlme.Queue.Lock, flags);
- }
-
- /*! \brief The destructor of MLME Queue
---- rt2500.orig/Module/rtmp.h
-+++ rt2500/Module/rtmp.h
-@@ -773,7 +773,6 @@
- ULONG ChannelQuality; // 0..100, Channel Quality Indication for Roaming
-
- BOOLEAN Running;
-- spinlock_t TaskLock;
- MLME_QUEUE Queue;
-
- UINT ShiftReg;
-@@ -1573,10 +1572,13 @@
- IN ULONG MsgLen,
- IN PVOID Msg);
-
--BOOLEAN MlmeDequeue(
-+BOOLEAN MlmeGetHead(
- IN MLME_QUEUE *Queue,
- OUT MLME_QUEUE_ELEM **Elem);
-
-+BOOLEAN MlmeDequeue(
-+ IN MLME_QUEUE *Queue);
-+
- VOID MlmeRestartStateMachine(
- IN PRTMP_ADAPTER pAd);
-
Deleted: tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/005_fix_error_rate_vars.diff
===================================================================
--- unstable/rt2500/debian/patches/005_fix_error_rate_vars.diff 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/005_fix_error_rate_vars.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,45 +0,0 @@
---- rt2500.orig/Module/mlme.c
-+++ rt2500/Module/mlme.c
-@@ -901,7 +901,6 @@
- {
- ULONG TxFailCnt, TxOkCnt, TxRetryCnt, TxCnt;
- ULONG RxFailCnt, RxOkCnt, RxCnt, Cnt0, OldFcsCount;
-- static ULONG TxPER = 0, TxPRR = 0, RxPER = 0;
-
- //
- // monitor TX counters change for the past period
-@@ -914,12 +913,6 @@
- pAd->Mlme.PrevWlanCounters.TransmittedFragmentCount.vv.LowPart;
- TxCnt = TxOkCnt + TxFailCnt;
-
-- if (TxCnt > 5) // if too few TX samples, skip TX related statistics
-- {
-- TxPER = (TxFailCnt * 100) / TxCnt;
-- TxPRR = ((TxRetryCnt + TxFailCnt) * 100) / TxCnt;
-- }
--
- //
- // calculate RX PER
- //
-@@ -943,8 +936,6 @@
- pAd->Mlme.PrevWlanCounters.FCSErrorCount.vv.LowPart;
- RxCnt = RxOkCnt + RxFailCnt;
-
-- if (RxCnt > 5)
-- RxPER = (RxFailCnt * 100) / RxCnt;
- //printk("!! 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
-@@ -966,8 +957,11 @@
- LinkDown(pAd);
- }
- }
-- else
-+ else if (TxCnt > 5 && RxCnt > 5)
- {
-+ ULONG TxPRR = ((TxRetryCnt + TxFailCnt) * 100) / TxCnt;
-+ ULONG RxPER = (RxFailCnt * 100) / RxCnt;
-+
- // ChannelQuality = W1*RSSI + W2*TxPRR + W3*RxPER (RSSI 0..100), (TxPER 100..0), (RxPER 100..0)
- pAd->Mlme.ChannelQuality = (RSSI_WEIGHTING * pAd->PortCfg.LastRssi +
- TX_WEIGHTING * (100 - TxPRR) +
Copied: tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/005_fix_error_rate_vars.diff (from rev 128, unstable/rt2500/debian/patches/005_fix_error_rate_vars.diff)
===================================================================
--- tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/005_fix_error_rate_vars.diff (rev 0)
+++ tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/005_fix_error_rate_vars.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1,45 @@
+--- rt2500.orig/Module/mlme.c
++++ rt2500/Module/mlme.c
+@@ -897,7 +897,6 @@
+ {
+ ULONG TxFailCnt, TxOkCnt, TxRetryCnt, TxCnt;
+ ULONG RxFailCnt, RxOkCnt, RxCnt, Cnt0, OldFcsCount;
+- static ULONG TxPER = 0, TxPRR = 0, RxPER = 0;
+
+ //
+ // monitor TX counters change for the past period
+@@ -910,12 +909,6 @@
+ pAd->Mlme.PrevWlanCounters.TransmittedFragmentCount.vv.LowPart;
+ TxCnt = TxOkCnt + TxFailCnt;
+
+- if (TxCnt > 5) // if too few TX samples, skip TX related statistics
+- {
+- TxPER = (TxFailCnt * 100) / TxCnt;
+- TxPRR = ((TxRetryCnt + TxFailCnt) * 100) / TxCnt;
+- }
+-
+ //
+ // calculate RX PER
+ //
+@@ -939,8 +932,6 @@
+ pAd->Mlme.PrevWlanCounters.FCSErrorCount.vv.LowPart;
+ RxCnt = RxOkCnt + RxFailCnt;
+
+- if (RxCnt > 5)
+- RxPER = (RxFailCnt * 100) / RxCnt;
+ //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
+@@ -962,8 +953,11 @@
+ LinkDown(pAd);
+ }
+ }
+- else
++ else if (TxCnt > 5 && RxCnt > 5)
+ {
++ ULONG TxPRR = ((TxRetryCnt + TxFailCnt) * 100) / TxCnt;
++ ULONG RxPER = (RxFailCnt * 100) / RxCnt;
++
+ // ChannelQuality = W1*RSSI + W2*TxPRR + W3*RxPER (RSSI 0..100), (TxPER 100..0), (RxPER 100..0)
+ pAd->Mlme.ChannelQuality = (RSSI_WEIGHTING * pAd->PortCfg.LastRssi +
+ TX_WEIGHTING * (100 - TxPRR) +
Deleted: tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/006_2.6.24.diff
===================================================================
--- unstable/rt2500/debian/patches/006_2.6.24.diff 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/006_2.6.24.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,11 +0,0 @@
---- rt2500.orig/Module/rtmp_main.c
-+++ rt2500/Module/rtmp_main.c
-@@ -251,8 +251,6 @@
- goto err_out;
- }
-
-- SET_MODULE_OWNER(net_dev);
--
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
- SET_NETDEV_DEV(net_dev, &(pPci_Dev->dev));
- #endif
Deleted: tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/series
===================================================================
--- unstable/rt2500/debian/patches/series 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/series 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,4 +0,0 @@
-006_2.6.24.diff
-000_if_name.diff -p0
-004_fix_mlme_queue_locking.diff
-005_fix_error_rate_vars.diff
Copied: tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/series (from rev 129, unstable/rt2500/debian/patches/series)
===================================================================
--- tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/series (rev 0)
+++ tags/rt2500-1.1.0-b4+cvs20080623-1/debian/patches/series 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1,2 @@
+000_if_name.diff
+005_fix_error_rate_vars.diff
Copied: tags/rt2570-1.1.0+cvs20080623-1 (from rev 124, unstable/rt2570)
Deleted: tags/rt2570-1.1.0+cvs20080623-1/debian/changelog
===================================================================
--- unstable/rt2570/debian/changelog 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt2570-1.1.0+cvs20080623-1/debian/changelog 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,82 +0,0 @@
-rt2570 (1.1.0+cvs20070927-2) unstable; urgency=low
-
- [Ben Hutchings]
- * Copied recommendations and suggestions from modules packages to
- rt2570-source to make them more visible
-
- --
-
-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-1/debian/changelog (from rev 132, unstable/rt2570/debian/changelog)
===================================================================
--- tags/rt2570-1.1.0+cvs20080623-1/debian/changelog (rev 0)
+++ tags/rt2570-1.1.0+cvs20080623-1/debian/changelog 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1,86 @@
+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-1/debian/patches/000_if_name.diff
===================================================================
--- unstable/rt2570/debian/patches/000_if_name.diff 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt2570-1.1.0+cvs20080623-1/debian/patches/000_if_name.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,112 +0,0 @@
---- Module/rtusb_main.c.orig
-+++ Module/rtusb_main.c
-@@ -42,7 +42,7 @@
-
- static char *ifname = NULL ;
- MODULE_PARM(ifname, "s");
--MODULE_PARM_DESC(ifname, "Network device name (default rausb%d)");
-+MODULE_PARM_DESC(ifname, "Network device name (default eth%d)");
- #else
- static int debug = 0; /* Default is off. */
- module_param(debug, int, 0);
-@@ -50,7 +50,7 @@
-
- static char *ifname = NULL ;
- module_param(ifname, charp, 0);
--MODULE_PARM_DESC(ifname, "Network device name (default rausb%d)");
-+MODULE_PARM_DESC(ifname, "Network device name (default eth%d)");
- #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) */
-
- #ifdef RT2500_DBG
-@@ -1608,43 +1608,17 @@
- pAdapter->net->weight = 64;
- pAdapter->MediaState = NdisMediaStateDisconnected;
-
-- {// find available
-- int i=0;
-- char slot_name[IFNAMSIZ];
-- struct net_device *device;
-+ {
- struct usb_interface *ifp = &dev->actconfig->interface[interface]; // get interface from system
- struct usb_interface_descriptor *as;
- struct usb_endpoint_descriptor *ep;
-
- // 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(netdev->name, "rausb%d");
-+ strcpy(netdev->name, "eth%d");
- else
- strncpy(netdev->name, ifname, IFNAMSIZ);
-
-- for (i = 0; i < 8; i++)
-- {
-- sprintf(slot_name, netdev->name, i);
--
-- for (device = first_net_device(); device != NULL;
-- device = next_net_device(device))
-- {
-- if (strncmp(device->name, slot_name, IFNAMSIZ) == 0)
-- {
-- break;
-- }
-- }
-- if(device == NULL) break;
-- }
-- if(i == 8)
-- {
-- DBGPRINT(RT_DEBUG_ERROR, "No available slot name\n");
-- return NULL;
-- }
-- sprintf(netdev->name, slot_name, i);
-- DBGPRINT(RT_DEBUG_INFO, "usbdevice->name %s\n", netdev->name);
--
- /* get Max Packet Size from usb_dev endpoint */
- //ifp = dev->actconfig->interface + i;
- as = ifp->altsetting + ifp->act_altsetting;
-@@ -1950,43 +1924,16 @@
-
- SET_NETDEV_DEV(pAdapter->net, &intf->dev);
-
-- {// find available
-- int i=0;
-- char slot_name[IFNAMSIZ];
-- struct net_device *device;
-+ {
- struct usb_host_interface *iface_desc;
- struct usb_endpoint_descriptor *endpoint;
-
- // 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(pAdapter->net->name, "rausb%d");
-+ strcpy(pAdapter->net->name, "eth%d");
- else
- strncpy(pAdapter->net->name, ifname, IFNAMSIZ);
-
-- for (i = 0; i < 8; i++)
-- {
-- sprintf(slot_name, pAdapter->net->name, i);
--
-- for (device = first_net_device(); device != NULL;
-- device = next_net_device(device))
-- {
-- if (strncmp(device->name, slot_name, IFNAMSIZ) == 0)
-- {
-- break;
-- }
-- }
-- if(device == NULL) break;
-- }
-- if(i == 8)
-- {
-- DBGPRINT(RT_DEBUG_ERROR, "No available slot name\n");
-- return res;
-- }
--
-- sprintf(pAdapter->net->name, slot_name, i);
-- DBGPRINT(RT_DEBUG_INFO, "usbdevice->name %s\n", pAdapter->net->name);
--
- /* get the active interface descriptor */
- iface_desc = intf->cur_altsetting;
-
Copied: tags/rt2570-1.1.0+cvs20080623-1/debian/patches/000_if_name.diff (from rev 132, unstable/rt2570/debian/patches/000_if_name.diff)
===================================================================
--- tags/rt2570-1.1.0+cvs20080623-1/debian/patches/000_if_name.diff (rev 0)
+++ tags/rt2570-1.1.0+cvs20080623-1/debian/patches/000_if_name.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1,125 @@
+--- rt2570.orig/Module/rtusb_main.c
++++ rt2570/Module/rtusb_main.c
+@@ -42,7 +42,7 @@
+
+ static char *ifname = NULL ;
+ MODULE_PARM(ifname, "s");
+-MODULE_PARM_DESC(ifname, "Network device name (default rausb%d)");
++MODULE_PARM_DESC(ifname, "Network device name (default eth%d)");
+ #else
+ static int debug = 0; /* Default is off. */
+ module_param(debug, int, 0);
+@@ -50,7 +50,7 @@
+
+ static char *ifname = NULL ;
+ module_param(ifname, charp, 0);
+-MODULE_PARM_DESC(ifname, "Network device name (default rausb%d)");
++MODULE_PARM_DESC(ifname, "Network device name (default eth%d)");
+ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) */
+
+ #ifdef RT2500_DBG
+@@ -1656,47 +1656,17 @@
+ SET_NETDEV_DEV(netdev, &intf->dev);
+
+
+- {// find available
+- int i=0;
+- char slot_name[IFNAMSIZ];
+- struct net_device *device;
++ {
+ struct usb_interface *ifp = &dev->actconfig->interface[interface]; // get interface from system
+ struct usb_interface_descriptor *as;
+ struct usb_endpoint_descriptor *ep;
+
+ // 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(netdev->name, "rausb%d");
++ strcpy(netdev->name, "eth%d");
+ else
+ strncpy(netdev->name, ifname, IFNAMSIZ);
+
+- for (i = 0; i < 8; i++)
+- {
+- sprintf(slot_name, netdev->name, i);
+-
+- read_lock_bh(&dev_base_lock); // avoid multiple init
+- for (device = first_net_device(); device != NULL;
+- device = next_net_device(device))
+- {
+- if (strncmp(device->name, slot_name, IFNAMSIZ) == 0)
+- {
+- break;
+- }
+- }
+- read_unlock_bh(&dev_base_lock);
+-
+- if(device == NULL) break;
+- }
+- if(i == 8)
+- {
+- DBGPRINT(RT_DEBUG_ERROR, "No available slot name\n");
+- KPRINT(KERN_CRIT, "No available slot name\n");
+- goto out;
+- }
+- sprintf(netdev->name, slot_name, i);
+- DBGPRINT(RT_DEBUG_INFO, "usb device name %s\n", netdev->name);
+-
+ /* get Max Packet Size from usb_dev endpoint */
+ //ifp = dev->actconfig->interface + i;
+ as = ifp->altsetting + ifp->act_altsetting;
+@@ -1948,52 +1918,16 @@
+
+ SET_NETDEV_DEV(pAdapter->net, &intf->dev);
+
+- {// find available
+- int i=0;
+- char slot_name[IFNAMSIZ];
++ {
+ struct usb_host_interface *iface_desc;
+ struct usb_endpoint_descriptor *endpoint;
+
+ // 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(pAdapter->net->name, "rausb%d");
++ strcpy(pAdapter->net->name, "eth%d");
+ else
+ strncpy(pAdapter->net->name, ifname, IFNAMSIZ);
+
+- for (i = 0; i < 8; i++)
+- {
+- sprintf(slot_name, pAdapter->net->name, i);
+-
+-#if 1
+- if(dev_get_by_name(slot_name)==NULL)
+- break;
+-#else
+- {struct net_device *device;
+- read_lock_bh(&dev_base_lock); // avoid multiple init
+- for (device = first_net_device(); device != NULL;
+- device = next_net_device(device))
+- {
+- if (strncmp(device->name, slot_name, IFNAMSIZ) == 0)
+- {
+- break;
+- }
+- }
+- read_unlock_bh(&dev_base_lock);
+-
+- if(device == NULL) break;}
+-#endif
+- }
+- if(i == 8)
+- {
+- DBGPRINT(RT_DEBUG_ERROR, "No available slot name\n");
+- KPRINT(KERN_CRIT, "No available slot name\n");
+- goto out;
+- }
+-
+- sprintf(pAdapter->net->name, slot_name, i);
+- DBGPRINT(RT_DEBUG_INFO, "usb device name %s\n", pAdapter->net->name);
+-
+ /* get the active interface descriptor */
+ iface_desc = intf->cur_altsetting;
+
Deleted: tags/rt2570-1.1.0+cvs20080623-1/debian/patches/004_fix_mlme_queue_locking.diff
===================================================================
--- unstable/rt2570/debian/patches/004_fix_mlme_queue_locking.diff 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt2570-1.1.0+cvs20080623-1/debian/patches/004_fix_mlme_queue_locking.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,250 +0,0 @@
---- rt2570.orig/Module/mlme.c
-+++ rt2570/Module/mlme.c
-@@ -242,7 +242,6 @@
- }
-
- pAd->Mlme.Running = FALSE;
-- NdisAllocateSpinLock(&pAd->Mlme.TaskLock);
-
- // initialize the two tables
- // MacTableInit(pAd);
-@@ -350,19 +349,18 @@
-
- // Only accept MLME and Frame from peer side, no other
- // (control/data) frame should get into this state machine
-- NdisAcquireSpinLock(&pAd->Mlme.TaskLock);
-+ NdisAcquireSpinLock(&pAd->Mlme.Queue.Lock);
- if(pAd->Mlme.Running)
- {
-- NdisReleaseSpinLock(&pAd->Mlme.TaskLock);
-+ NdisReleaseSpinLock(&pAd->Mlme.Queue.Lock);
- return;
- }
-- else
-- {
-- pAd->Mlme.Running = TRUE;
-- }
-- NdisReleaseSpinLock(&pAd->Mlme.TaskLock);
-+ pAd->Mlme.Running = TRUE;
-+
-+ while (MlmeGetHead(&pAd->Mlme.Queue, &Elem)) {
-+ smp_read_barrier_depends();
-+ if (!Elem->Occupied) break;
-
-- while (TRUE) {
- if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_MLME_RESET_IN_PROGRESS) ||
- RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS) ||
- RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_REMOVE_IN_PROGRESS))
-@@ -371,18 +369,10 @@
- break;
- }
-
-- NdisAcquireSpinLock(&pAd->Mlme.Queue.Lock);
-- if (!MlmeDequeue(&pAd->Mlme.Queue, &Elem)) {
-- NdisReleaseSpinLock(&pAd->Mlme.Queue.Lock);
-- break;
-- }
-- NdisReleaseSpinLock(&pAd->Mlme.Queue.Lock);
--
-- if (pAd->PortCfg.BssType == BSS_MONITOR)
-- continue;
-+ NdisReleaseSpinLock(&pAd->Mlme.Queue.Lock);
-
- //From message type, determine which state machine I should drive
-- switch (Elem->Machine)
-+ if (pAd->PortCfg.BssType != BSS_MONITOR) switch (Elem->Machine)
- {
- case ASSOC_STATE_MACHINE:
- StateMachinePerformAction(pAd, &pAd->Mlme.AssocMachine, Elem);
-@@ -408,8 +398,10 @@
- } // end of switch
-
- // free MLME element
-+ smp_mb();
- Elem->Occupied = FALSE;
-- Elem->MsgLen = 0;
-+ NdisAcquireSpinLock(&pAd->Mlme.Queue.Lock);
-+ MlmeDequeue(&pAd->Mlme.Queue);
- }
-
- if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_MLME_RESET_IN_PROGRESS))
-@@ -441,9 +433,8 @@
- RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_MLME_RESET_IN_PROGRESS);
- }
-
-- NdisAcquireSpinLock(&pAd->Mlme.TaskLock);
- pAd->Mlme.Running = FALSE;
-- NdisReleaseSpinLock(&pAd->Mlme.TaskLock);
-+ NdisReleaseSpinLock(&pAd->Mlme.Queue.Lock);
-
- }
-
-@@ -465,31 +456,26 @@
- RTMPCancelTimer(&pAd->Mlme.SyncAux.BeaconTimer);
- RTMPCancelTimer(&pAd->Mlme.SyncAux.ScanTimer);
-
-- NdisAcquireSpinLock(&pAd->Mlme.TaskLock);
-+ NdisAcquireSpinLock(&pAd->Mlme.Queue.Lock);
- if(pAd->Mlme.Running)
- {
-- NdisReleaseSpinLock(&pAd->Mlme.TaskLock);
-+ NdisReleaseSpinLock(&pAd->Mlme.Queue.Lock);
- return;
- }
- else
- {
- pAd->Mlme.Running = TRUE;
- }
-- NdisReleaseSpinLock(&pAd->Mlme.TaskLock);
-
- // Remove all Mlme queues elements
-- NdisAcquireSpinLock(&pAd->Mlme.Queue.Lock);
-- while (MlmeDequeue(&pAd->Mlme.Queue, &Elem)) {
-- // free MLME element
-- Elem->Occupied = FALSE;
-- Elem->MsgLen = 0;
-+ while (MlmeGetHead(&pAd->Mlme.Queue, &Elem)) {
-+ MlmeDequeue(&pAd->Mlme.Queue);
-+ Elem->Occupied = FALSE;
- }
-- NdisReleaseSpinLock(&pAd->Mlme.Queue.Lock);
-
- // Remove running state
-- NdisAcquireSpinLock(&pAd->Mlme.TaskLock);
- pAd->Mlme.Running = FALSE;
-- NdisReleaseSpinLock(&pAd->Mlme.TaskLock);
-+ NdisReleaseSpinLock(&pAd->Mlme.Queue.Lock);
-
- RTUSBCleanUpMLMEWaitQueue(pAd);
- RTUSBCleanUpMLMEBulkOutQueue(pAd);
-@@ -2793,11 +2779,12 @@
- NdisReleaseSpinLock(&Queue->Lock);
- DBGPRINT(RT_DEBUG_INFO,"MlmeEnqueue, num=%d\n",Queue->Num);
-
-- Queue->Entry[Tail].Occupied = TRUE;
- Queue->Entry[Tail].Machine = Machine;
- Queue->Entry[Tail].MsgType = MsgType;
- Queue->Entry[Tail].MsgLen = MsgLen;
- memcpy(Queue->Entry[Tail].Msg, Msg, MsgLen);
-+ smp_wmb();
-+ Queue->Entry[Tail].Occupied = TRUE;
- }
- return TRUE;
- }
-@@ -2870,19 +2857,20 @@
- DBGPRINT(RT_DEBUG_INFO, "MlmeEnqueueForRecv, num=%d\n",Queue->Num);
-
- // OK, we got all the informations, it is time to put things into queue
-- Queue->Entry[Tail].Occupied = TRUE;
- Queue->Entry[Tail].Machine = Machine;
- Queue->Entry[Tail].MsgType = MsgType;
- Queue->Entry[Tail].MsgLen = MsgLen;
-
- Queue->Entry[Tail].Rssi = Rssi;
- memcpy(Queue->Entry[Tail].Msg, Msg, MsgLen);
-+ smp_wmb();
-+ Queue->Entry[Tail].Occupied = TRUE;
-
- RTUSBMlmeUp(pAd, (&(pAd->mlme_semaphore)));
-
- return TRUE;
- }
--/*! \brief Dequeue a message from the MLME Queue
-+/*! \brief Get the first message from the MLME Queue
- * WARNING: Must be call with Mlme.Queue.Lock held
- * \param *Queue The MLME Queue
- * \param *Elem The message dequeued from MLME Queue
-@@ -2893,15 +2881,36 @@
- IRQL = DISPATCH_LEVEL
-
- */
--BOOLEAN MlmeDequeue(
-+BOOLEAN MlmeGetHead(
- IN MLME_QUEUE *Queue,
- OUT MLME_QUEUE_ELEM **Elem)
- {
- if (Queue->Num == 0)
- return FALSE; //Empty
-
-- *Elem = &Queue->Entry[Queue->Head++];
-- Queue->Head %= MAX_LEN_OF_MLME_QUEUE;
-+ *Elem = &Queue->Entry[Queue->Head];
-+ DBGPRINT(RT_DEBUG_INFO, "MlmeDequeue, num=%d\n",Queue->Num);
-+
-+ return TRUE;
-+}
-+
-+/*! \brief Remove the first message from the MLME Queue
-+ * WARNING: Must be call with Mlme.Queue.Lock held
-+ * \param *Queue The MLME Queue
-+ * \return TRUE if a message was remove, FALSE if the queue was empty
-+ * \pre
-+ * \post
-+
-+ IRQL = DISPATCH_LEVEL
-+
-+ */
-+BOOLEAN MlmeDequeue(
-+ IN MLME_QUEUE *Queue)
-+{
-+ if (Queue->Num == 0)
-+ return FALSE; //Empty
-+
-+ Queue->Head = (Queue->Head + 1) % MAX_LEN_OF_MLME_QUEUE;
- Queue->Num--;
- DBGPRINT(RT_DEBUG_INFO, "MlmeDequeue, num=%d\n",Queue->Num);
-
-@@ -2918,15 +2927,14 @@
-
- RTMP_SET_FLAG(pAd, fRTMP_ADAPTER_MLME_RESET_IN_PROGRESS);
-
-- NdisAcquireSpinLock(&pAd->Mlme.TaskLock);
-+ NdisAcquireSpinLock(&pAd->Mlme.Queue.Lock);
- if(pAd->Mlme.Running)
- {
- DBGPRINT(RT_DEBUG_TRACE, "<== MlmeRestartStateMachine, Mlme is Runing[Queue=%d]!\n", pAd->Mlme.Queue.Num);
-- NdisReleaseSpinLock(&pAd->Mlme.TaskLock);
-+ NdisReleaseSpinLock(&pAd->Mlme.Queue.Lock);
- return;
- }
- pAd->Mlme.Running = TRUE;
-- NdisReleaseSpinLock(&pAd->Mlme.TaskLock);
-
- MlmeQueueDestroy(&pAd->Mlme.Queue);
-
-@@ -2956,9 +2964,8 @@
- RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_MLME_RESET_IN_PROGRESS);
-
- // Remove running state
-- NdisAcquireSpinLock(&pAd->Mlme.TaskLock);
- pAd->Mlme.Running = FALSE;
-- NdisReleaseSpinLock(&pAd->Mlme.TaskLock);
-+ NdisReleaseSpinLock(&pAd->Mlme.Queue.Lock);
-
- DBGPRINT(RT_DEBUG_TRACE, "<== MlmeRestartStateMachine\n");
- }
---- rt2570.orig/Module/rt2570sw.h
-+++ rt2570/Module/rt2570sw.h
-@@ -1077,7 +1077,6 @@
- ULONG ChannelQuality; // 0..100, Channel Quality Indication for Roaming
-
- BOOLEAN Running;
-- spinlock_t TaskLock;
- MLME_QUEUE Queue;
-
- UINT ShiftReg;
-@@ -2341,10 +2340,13 @@
- IN ULONG MsgLen,
- IN PVOID Msg);
-
--BOOLEAN MlmeDequeue(
-+BOOLEAN MlmeGetHead(
- IN MLME_QUEUE *Queue,
- OUT MLME_QUEUE_ELEM **Elem);
-
-+BOOLEAN MlmeDequeue(
-+ IN MLME_QUEUE *Queue);
-+
- #if 1
- VOID MlmeRestartStateMachine(
- IN PRT2570ADAPTER pAd);
Deleted: tags/rt2570-1.1.0+cvs20080623-1/debian/patches/005_fix_delays.diff
===================================================================
--- unstable/rt2570/debian/patches/005_fix_delays.diff 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt2570-1.1.0+cvs20080623-1/debian/patches/005_fix_delays.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,42 +0,0 @@
---- rt2570.orig/Module/rt2570sw.h
-+++ rt2570/Module/rt2570sw.h
-@@ -384,7 +384,7 @@
- #define CMD_SingleRead 0x0C
- #define CMD_SingleWrite 0x0D
-
--#define NdisMSleep mdelay
-+#define NdisMSleep msleep
-
-
- // Assert MACRO to make sure program running
---- rt2570.orig/Module/rtusb_main.c
-+++ rt2570/Module/rtusb_main.c
-@@ -847,7 +847,7 @@
- }
- }
-
-- NdisMSleep(500000);
-+ NdisMSleep(500);
- }
-
- NICResetFromError(pAdapter);
---- rt2570.orig/Module/rtusb_bulk.c
-+++ rt2570/Module/rtusb_bulk.c
-@@ -1386,7 +1386,7 @@
- usb_kill_urb(pMLMEContext->pUrb);
-
- // Sleep 200 microsecs to give cancellation time to work
-- NdisMSleep(200);
-+ udelay(200);
- }
- }
-
-@@ -1405,7 +1405,7 @@
- usb_kill_urb(pBeaconContext->pUrb);
-
- // Sleep 200 microsecs to give cancellation time to work
-- NdisMSleep(200);
-+ udelay(200);
- }
- }
-
Copied: tags/rt2570-1.1.0+cvs20080623-1/debian/patches/005_fix_delays.diff (from rev 130, unstable/rt2570/debian/patches/005_fix_delays.diff)
===================================================================
--- tags/rt2570-1.1.0+cvs20080623-1/debian/patches/005_fix_delays.diff (rev 0)
+++ tags/rt2570-1.1.0+cvs20080623-1/debian/patches/005_fix_delays.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1,18 @@
+--- rt2570.orig/Module/rt2570sw.h
++++ rt2570/Module/rt2570sw.h
+@@ -391,7 +391,14 @@
+ #define CMD_SingleRead 0x0C
+ #define CMD_SingleWrite 0x0D
+
+-#define NdisMSleep mdelay
++static inline void NdisMSleep(unsigned long usecs)
++{
++ while (usecs > MAX_UDELAY_MS * 1000) {
++ udelay(MAX_UDELAY_MS * 1000);
++ usecs -= MAX_UDELAY_MS * 1000;
++ }
++ udelay(usecs);
++}
+
+
+ // Assert MACRO to make sure program running
Deleted: tags/rt2570-1.1.0+cvs20080623-1/debian/patches/006_fix_probe_148f_2573.diff
===================================================================
--- unstable/rt2570/debian/patches/006_fix_probe_148f_2573.diff 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt2570-1.1.0+cvs20080623-1/debian/patches/006_fix_probe_148f_2573.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,39 +0,0 @@
---- rt2570.orig/Module/rtusb_main.c
-+++ rt2570/Module/rtusb_main.c
-@@ -1853,6 +1853,7 @@
- {
- struct usb_device *dev = interface_to_usbdev(intf);
- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER)NULL;
-+ USHORT version = 0;
- int i;
- struct net_device *netdev;
- int res = -ENOMEM;
-@@ -1881,16 +1883,25 @@
- {
- //if (!(pAdapter->net = init_etherdev(0, 0) )) {
- printk("alloc_etherdev failed\n");
--
-- module_put(THIS_MODULE);
-+ usb_put_dev(dev);
- return res;
- }
-
- pAdapter = netdev->priv;
-+ pAdapter->usb = dev;
-+
-+ RTUSBReadMACRegister(pAdapter, MAC_CSR0, &version);
-+ if (version == 0 || (le16_to_cpu(version) & 0xfff0) != 0)
-+ {
-+ printk("ASIC version not matching\n");
-+ kfree(netdev);
-+ usb_put_dev(dev);
-+ return -ENODEV;
-+ }
-+
- pAdapter->net = netdev;
- netif_stop_queue(netdev);
- pAdapter->config = &dev->config->desc;
-- pAdapter->usb = dev;
- SET_MODULE_OWNER(pAdapter->net);
- ether_setup(pAdapter->net);
- netdev->open = usb_rtusb_open;
Copied: tags/rt2570-1.1.0+cvs20080623-1/debian/patches/006_fix_probe_148f_2573.diff (from rev 131, unstable/rt2570/debian/patches/006_fix_probe_148f_2573.diff)
===================================================================
--- tags/rt2570-1.1.0+cvs20080623-1/debian/patches/006_fix_probe_148f_2573.diff (rev 0)
+++ tags/rt2570-1.1.0+cvs20080623-1/debian/patches/006_fix_probe_148f_2573.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1,32 @@
+--- rt2570.orig/Module/rtusb_main.c
++++ rt2570/Module/rtusb_main.c
+@@ -1853,6 +1853,7 @@
+ {
+ struct usb_device *dev = interface_to_usbdev(intf);
+ PRT2570ADAPTER pAdapter = (PRT2570ADAPTER)NULL;
++ USHORT version = 0;
+ int i;
+ struct net_device *netdev;
+ int res = -ENOMEM;
+@@ -1884,10 +1885,20 @@
+ }
+
+ pAdapter = netdev->priv;
++ 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);
++ res = -ENODEV;
++ goto out_noalloc;
++ }
++
+ pAdapter->net = netdev;
+ netif_stop_queue(netdev);
+ pAdapter->config = &dev->config->desc;
+- pAdapter->usb = dev;
+ SET_MODULE_OWNER(pAdapter->net);
+ ether_setup(pAdapter->net);
+
Deleted: tags/rt2570-1.1.0+cvs20080623-1/debian/patches/series
===================================================================
--- unstable/rt2570/debian/patches/series 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt2570-1.1.0+cvs20080623-1/debian/patches/series 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,4 +0,0 @@
-000_if_name.diff -p0
-004_fix_mlme_queue_locking.diff
-005_fix_delays.diff
-006_fix_probe_148f_2573.diff
Copied: tags/rt2570-1.1.0+cvs20080623-1/debian/patches/series (from rev 132, unstable/rt2570/debian/patches/series)
===================================================================
--- tags/rt2570-1.1.0+cvs20080623-1/debian/patches/series (rev 0)
+++ tags/rt2570-1.1.0+cvs20080623-1/debian/patches/series 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1,3 @@
+000_if_name.diff
+005_fix_delays.diff
+006_fix_probe_148f_2573.diff
Copied: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1 (from rev 124, unstable/rt73)
Deleted: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/changelog
===================================================================
--- unstable/rt73/debian/changelog 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/changelog 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,92 +0,0 @@
-rt73 (1:1.0.3.6-cvs20071123-dfsg1-4) unstable; urgency=low
-
- [ Ben Hutchings ]
- * Recommends: firmware-ralink, replacing firmware-rt73.
- Closes: #454920.
-
- --
-
-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-1/debian/changelog (from rev 134, unstable/rt73/debian/changelog)
===================================================================
--- tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/changelog (rev 0)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/changelog 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1,97 @@
+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-1/debian/control.modules.in (from rev 136, unstable/rt73/debian/control.modules.in)
===================================================================
--- tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/control.modules.in (rev 0)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/control.modules.in 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1,18 @@
+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.
Deleted: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/modules.packages
===================================================================
--- unstable/rt73/debian/modules.packages 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/modules.packages 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,78 +0,0 @@
-%define KSRC %{?$KSRC:%{$KSRC}}%{!?$KSRC:/usr/src/linux}
-%define KVERS %{?$KVERS:%{$KVERS}}%{!?$KVERS:%`sed -n -e '/UTS_RELEASE/s/^[^"]*"\([^"]*\)".*$/\1/p' %{KSRC}/include/linux/version.h 2>/dev/null || echo "UNKNOWN"`}
-%define KDREV %{?$KDREV:%{$KDREV}}%{!?$KDREV:UNKNOWN}
-
-Source: rt73-source
-Section: 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
-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: module-assistant, bzip2
-%if %`test -x debian/yada || echo 1`
-Build-Depends: yada
-%endif
-Build: sh
- CC=${CC:-gcc}
- make -C /lib/modules/%{KVERS}/build SUBDIRS=$(pwd) modules
-Clean: sh
- make clean || true
-
-Package: rt73-modules-%{KVERS}
-Architecture: any
-Depends: rt73-common
-Recommends: firmware-ralink
-%if %{KDREV}
-Recommends: linux-image-%{KVERS} (= %{KDREV})
-%else
-Recommends: linux-image-%{KVERS}
-%endif
-Recommends: wireless-tools
-Suggests: rutilt
-Provides: rt73-modules
-Description: RT73(RT2571W) Wireless Lan Linux Driver - kernel module
- This package provides kernel module for Linux %{KVERS}
-Install: sh
- if [ -f %{KSRC}/scripts/Makefile.modinst ]; then
- MODEXT=ko
- else
- MODEXT=o
- fi
- .
- yada install -lib -unstripped -into /lib/modules/%{KVERS}/kernel/drivers/net/wireless \
- -as rt73.$MODEXT rt73.ko
- yada install -doc -as README.Debian debian/README
-Postinst: sh
- if [ "$1" = "configure" ]; then
- if [ -e /boot/System.map-%{KVERS} ]; then
- depmod -a -F /boot/System.map-%{KVERS} %{KVERS} || true
- fi
- fi
-Postrm: sh
- if [ -e /boot/System.map-%{KVERS} ]; then
- depmod -a -F /boot/System.map-%{KVERS} %{KVERS} || true
- fi
-Contains: unstripped kernel-modules
-
-# Debug:
-# KSRC=%{KSRC}
-# KVERS=%{KVERS}
-# KDREV=%{KDREV}
Deleted: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/packages
===================================================================
--- unstable/rt73/debian/packages 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/packages 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,119 +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 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 Module/* modules/rt73
- chmod -x modules/rt73/*
- mkdir -p modules/rt73/debian
- sed 's/^rt73/rt73-source/' debian/changelog > modules/rt73/debian/changelog
- cp -a debian/modules.packages modules/rt73/debian/packages
- cp -a debian/README.modules modules/rt73/debian/README
-%if %{is_yada_bundled}
- cp -a debian/yada modules/rt73/debian
-%endif
- pushd modules/rt73
- %{YADA_COMMAND} rebuild
- debian/rules clean
- popd
- 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
-%if %{!?is_yada_bundled:1}
-Depends: yada
-%endif
-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 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-1/debian/packages (from rev 136, unstable/rt73/debian/packages)
===================================================================
--- tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/packages (rev 0)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/packages 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1,112 @@
+# 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 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 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-1/debian/patches/000_if_name.diff (from rev 134, unstable/rt73/debian/patches/000_if_name.diff)
===================================================================
--- tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/patches/000_if_name.diff (rev 0)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/patches/000_if_name.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1,54 @@
+--- rt73.orig/Module/rtmp_main.c
++++ rt73/Module/rtmp_main.c
+@@ -2225,10 +2225,7 @@
+
+ SET_NETDEV_DEV(netdev, &intf->dev);
+
+- {// find available
+- int i=0;
+- char slot_name[IFNAMSIZ];
+- //struct net_device *device;
++ {
+ struct usb_host_interface *iface_desc;
+ struct usb_endpoint_descriptor *endpoint;
+
+@@ -2237,39 +2234,6 @@
+ else
+ strncpy(pAd->net_dev->name, ifname, IFNAMSIZ);
+
+- for (i = 0; i < 8; i++)
+- {
+- sprintf(slot_name, pAd->net_dev->name, i);
+-
+-#if 1
+- if(dev_get_by_name(slot_name)==NULL)
+- break;
+-#else
+- read_lock_bh(&dev_base_lock); // avoid multiple init
+- for (device = first_net_device(); device != NULL;
+- device = next_net_device(device))
+- {
+- if (strncmp(device->name, slot_name, IFNAMSIZ) == 0)
+- {
+- break;
+- }
+- }
+- read_unlock_bh(&dev_base_lock);
+-
+- if(device == NULL) break;
+-#endif
+- }
+- if(i == 8)
+- {
+- DBGPRINT(RT_DEBUG_ERROR, "No available slot name\n");
+- KPRINT(KERN_CRIT, "No available slot name\n");
+- goto out;
+- }
+-
+- sprintf(pAd->net_dev->name, slot_name, i);
+- DBGPRINT(RT_DEBUG_ERROR, "usb device name %s\n", pAd->net_dev->name);
+-
+-
+ /* get the active interface descriptor */
+ iface_desc = intf->cur_altsetting;
+
Deleted: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/patches/001_fix_probe_148f_2573.diff
===================================================================
--- unstable/rt73/debian/patches/001_fix_probe_148f_2573.diff 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/patches/001_fix_probe_148f_2573.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,31 +0,0 @@
---- rt73.orig/Module/rtmp_main.c
-+++ rt73/Module/rtmp_main.c
-@@ -2114,6 +2114,7 @@
- {
- struct usb_device *dev = interface_to_usbdev(intf);
- PRTMP_ADAPTER pAd;
-+ ULONG version = 0;
- int i;
- struct net_device *netdev;
- int res = -ENOMEM;
-@@ -2151,10 +2152,19 @@
- }
-
- netdev->priv = pAd;
-+ pAd->pUsb_Dev = dev;
-+
-+ RTUSBReadMACRegister(pAd, MAC_CSR0, &version);
-+ if ((version & 0xf) == 0 || (le32_to_cpu(version) & 0xffff0) != 0x25730)
-+ {
-+ printk("ASIC version not matching\n");
-+ res = -ENODEV;
-+ goto out;
-+ }
-+
- pAd->net_dev = netdev;
- netif_stop_queue(netdev);
- pAd->config = &dev->config->desc;
-- pAd->pUsb_Dev = dev;
- SET_MODULE_OWNER(netdev);
- ether_setup(netdev);
-
Copied: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/patches/001_fix_probe_148f_2573.diff (from rev 134, unstable/rt73/debian/patches/001_fix_probe_148f_2573.diff)
===================================================================
--- tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/patches/001_fix_probe_148f_2573.diff (rev 0)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/patches/001_fix_probe_148f_2573.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1,31 @@
+--- rt73.orig/Module/rtmp_main.c
++++ rt73/Module/rtmp_main.c
+@@ -2154,6 +2154,7 @@
+ {
+ struct usb_device *dev = interface_to_usbdev(intf);
+ PRTMP_ADAPTER pAd;
++ ULONG version = 0;
+ int i;
+ struct net_device *netdev;
+ int res = -ENOMEM;
+@@ -2193,10 +2194,19 @@
+ }
+
+ netdev->priv = pAd;
++ pAd->pUsb_Dev = dev;
++
++ RTUSBReadMACRegister(pAd, MAC_CSR0, &version);
++ if ((version & 0xf) == 0 || (le32_to_cpu(version) & 0xffff0) != 0x25730)
++ {
++ KPRINT(KERN_INFO, "ASIC version not matching\n");
++ res = -ENODEV;
++ goto out;
++ }
++
+ pAd->net_dev = netdev;
+ netif_stop_queue(netdev);
+ pAd->config = &dev->config->desc;
+- pAd->pUsb_Dev = dev;
+ SET_MODULE_OWNER(netdev);
+ ether_setup(netdev);
+
Deleted: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/patches/002_fix_probe_crash.diff
===================================================================
--- unstable/rt73/debian/patches/002_fix_probe_crash.diff 2008-02-08 01:10:24 UTC (rev 124)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/patches/002_fix_probe_crash.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -1,43 +0,0 @@
---- rt73.orig/Module/rtmp_main.c
-+++ rt73/Module/rtmp_main.c
-@@ -2159,7 +2159,7 @@
- {
- printk("ASIC version not matching\n");
- res = -ENODEV;
-- goto out;
-+ goto out_noregnetdev;
- }
-
- pAd->net_dev = netdev;
-@@ -2258,7 +2258,7 @@
- res = register_netdev(netdev);
- if (res) {
- printk("register_netdev failed err=%d\n",res);
-- goto out;
-+ goto out_noregnetdev;
- }
-
- usb_set_intfdata(intf, pAd);
-@@ -2268,16 +2268,19 @@
- res = LoadFirmware(pAd, firmName);
- if (res) {
- DBGPRINT(RT_DEBUG_ERROR, "Failed to request Firmware.\n");
-- goto out;
-+ goto out_nofirmware;
- }
- return 0;
-
--out:
-+out_nofirmware:
-+ rt73usb_close_debugfs(pAd);
-+ unregister_netdev(netdev);
-+out_noregnetdev:
- free_netdev(netdev);
- out_nonetdev:
- kfree(pAd);
- out_noalloc:
-- module_put(THIS_MODULE);
-+ usb_put_dev(dev);
- return res;
- }
-
Copied: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/patches/002_fix_probe_crash.diff (from rev 134, unstable/rt73/debian/patches/002_fix_probe_crash.diff)
===================================================================
--- tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/patches/002_fix_probe_crash.diff (rev 0)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/patches/002_fix_probe_crash.diff 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1,37 @@
+--- rt73.orig/Module/rtmp_main.c
++++ rt73/Module/rtmp_main.c
+@@ -2201,7 +2201,7 @@
+ {
+ KPRINT(KERN_INFO, "ASIC version not matching\n");
+ res = -ENODEV;
+- goto out;
++ goto out_noregnetdev;
+ }
+
+ pAd->net_dev = netdev;
+@@ -2259,19 +2259,22 @@
+ res = register_netdev(netdev);
+ if (res) {
+ KPRINT(KERN_CRIT, "register_netdev failed err=%d\n",res);
+- goto out;
++ goto out_noregnetdev;
+ }
+
+ usb_set_intfdata(intf, pAd);
+
+ rt73usb_open_debugfs(pAd);
+ res = common_probe(pAd);
+- if (res) goto out;
++ if (res) goto out_nofirmware;
+
+ DBGPRINT(RT_DEBUG_TRACE, "<-- %s: res=%d\n", __FUNCTION__, res);
+ return 0;
+
+-out:
++out_nofirmware:
++ rt73usb_close_debugfs(pAd);
++ unregister_netdev(netdev);
++out_noregnetdev:
+ free_netdev(netdev);
+ out_nonetdev:
+ kfree(pAd);
Copied: tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/rules.modules (from rev 136, unstable/rt73/debian/rules.modules)
===================================================================
--- tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/rules.modules (rev 0)
+++ tags/rt73-1:1.0.3.6-cvs20080623-dfsg1-1/debian/rules.modules 2008-06-23 04:07:26 UTC (rev 137)
@@ -0,0 +1,43 @@
+#!/usr/bin/make -f
+
+export DH_COMPAT := 4
+
+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
+
+.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
+ $(MAKE) KERNDIR=$(KSRC) PATCHLEVEL=6
+ install -m 0644 rt73.ko $(CURDIR)/debian/rt73-modules-$(KVERS)/lib/modules/$(KVERS)/kernel/drivers/net/wireless
+
+ 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
More information about the Pkg-ralink-commits
mailing list