r189 - in unstable: rt2400/debian rt2400/debian/patches rt2500/debian rt2500/debian/patches

[Ben Hutchings]

Author: benh
Date: 2009-07-22 01:00:27 +0000 (Wed, 22 Jul 2009)
New Revision: 189

Added:
   unstable/rt2400/debian/patches/004_remove_broken_macros.diff
   unstable/rt2500/debian/patches/009_remove_broken_macros.diff
Modified:
   unstable/rt2400/debian/changelog
   unstable/rt2400/debian/patches/series
   unstable/rt2500/debian/changelog
   unstable/rt2500/debian/patches/series
Log:
Fix compatibility with kernel version 2.6.30


Modified: unstable/rt2400/debian/changelog
===================================================================
--- unstable/rt2400/debian/changelog	2009-07-21 20:41:08 UTC (rev 188)
+++ unstable/rt2400/debian/changelog	2009-07-22 01:00:27 UTC (rev 189)
@@ -1,8 +1,9 @@
 rt2400 (1.2.2+cvs20090424-2) unstable; urgency=low
 
   * Remove undeclared dependency on cpio (closes: bug#536975)
+  * Fix compatibility with kernel version 2.6.30
 
- -- Ben Hutchings <ben at decadent.org.uk>  Tue, 21 Jul 2009 22:37:30 +0200
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 22 Jul 2009 02:55:41 +0200
 
 rt2400 (1.2.2+cvs20090424-1) unstable; urgency=low
 

Added: unstable/rt2400/debian/patches/004_remove_broken_macros.diff
===================================================================
--- unstable/rt2400/debian/patches/004_remove_broken_macros.diff	                        (rev 0)
+++ unstable/rt2400/debian/patches/004_remove_broken_macros.diff	2009-07-22 01:00:27 UTC (rev 189)
@@ -0,0 +1,34 @@
+--- rt2400.orig/Module/rtmp.h
++++ rt2400/Module/rtmp.h
+@@ -43,14 +43,6 @@
+ 
+ #include "mlme.h"
+ 
+-#ifndef IRQ_HANDLED
+-/* For 2.6.x compatibility */
+-typedef void irqreturn_t;
+-#define IRQ_NONE
+-#define IRQ_HANDLED
+-#define IRQ_RETVAL(x)
+-#endif
+-
+ #ifndef HAVE_NETDEV_PRIV		/* netdev_priv() */
+ #define netdev_priv(_dev)	( _dev->priv )
+ #endif
+--- rt2400.orig/Module/rt_config.h
++++ rt2400/Module/rt_config.h
+@@ -91,14 +91,6 @@
+ #define SET_NETDEV_DEV(net, pdev) do { } while (0)
+ #endif
+ 
+-#ifndef pci_name
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
+-#define pci_name(__pPci_Dev)	(__pPci_Dev)->dev.bus_id
+-#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */
+-#define pci_name(__pPci_Dev)	(__pPci_Dev)->slot_name
+-#endif /*(LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */
+-#endif /* pci_name */
+-
+ // 2.5.44? 2.5.26?
+ #ifndef smp_read_barrier_depends
+ #define smp_read_barrier_depends() ((void)0)

Modified: unstable/rt2400/debian/patches/series
===================================================================
--- unstable/rt2400/debian/patches/series	2009-07-21 20:41:08 UTC (rev 188)
+++ unstable/rt2400/debian/patches/series	2009-07-22 01:00:27 UTC (rev 189)
@@ -1,3 +1,4 @@
 000_if_name.diff
 002_no_config_file.diff
 003_use_netdev_functions.diff
+004_remove_broken_macros.diff

Modified: unstable/rt2500/debian/changelog
===================================================================
--- unstable/rt2500/debian/changelog	2009-07-21 20:41:08 UTC (rev 188)
+++ unstable/rt2500/debian/changelog	2009-07-22 01:00:27 UTC (rev 189)
@@ -1,8 +1,9 @@
 rt2500 (1:1.1.0-b4+cvs20090424-2) unstable; urgency=low
 
   * Remove undeclared dependency on cpio (closes: bug#536979)
+  * Fix compatibility with kernel version 2.6.30
 
- -- Ben Hutchings <ben at decadent.org.uk>  Tue, 21 Jul 2009 22:37:48 +0200
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 22 Jul 2009 02:56:14 +0200
 
 rt2500 (1:1.1.0-b4+cvs20090424-1) unstable; urgency=low
 

Added: unstable/rt2500/debian/patches/009_remove_broken_macros.diff
===================================================================
--- unstable/rt2500/debian/patches/009_remove_broken_macros.diff	                        (rev 0)
+++ unstable/rt2500/debian/patches/009_remove_broken_macros.diff	2009-07-22 01:00:27 UTC (rev 189)
@@ -0,0 +1,34 @@
+--- rt2500.orig/Module/rtmp.h
++++ rt2500/Module/rtmp.h
+@@ -47,14 +47,6 @@
+ #include "oid.h"
+ #include "wpa.h"
+ 
+-#ifndef IRQ_HANDLED
+-/* For 2.6.x compatability */
+-typedef void irqreturn_t;
+-#define IRQ_NONE
+-#define IRQ_HANDLED
+-#define IRQ_RETVAL(x)
+-#endif
+-
+ // Krellan: Limit range of user TxPower settings from -31 to +0 dBm.
+ // We could accept -31 to +31 dBm, relative to 0 dBm which is defined
+ // as the EEPROM's recommended power setting.
+--- rt2500.orig/Module/rt_config.h
++++ rt2500/Module/rt_config.h
+@@ -179,14 +179,6 @@
+ #define SET_NETDEV_DEV(net, pdev) do { } while (0)
+ #endif
+ 
+-#ifndef pci_name
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
+-#define pci_name(__pPci_Dev)	(__pPci_Dev)->dev.bus_id
+-#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */
+-#define pci_name(__pPci_Dev)	(__pPci_Dev)->slot_name
+-#endif /*(LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */
+-#endif /* pci_name */
+-
+ // 2.5.44? 2.5.26?
+ #ifndef smp_read_barrier_depends
+ #define smp_read_barrier_depends() ((void)0)

Modified: unstable/rt2500/debian/patches/series
===================================================================
--- unstable/rt2500/debian/patches/series	2009-07-21 20:41:08 UTC (rev 188)
+++ unstable/rt2500/debian/patches/series	2009-07-22 01:00:27 UTC (rev 189)
@@ -2,3 +2,4 @@
 005_fix_error_rate_vars.diff
 007_no_config_file.diff
 008_use_netdev_functions.diff
+009_remove_broken_macros.diff