r16 - in unstable/rt2400/debian: . patches

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2007-07-15 19:56:16 +0000 (Sun, 15 Jul 2007)
New Revision: 16

Added:
   unstable/rt2400/debian/patches/2.6.22.diff
Modified:
   unstable/rt2400/debian/changelog
   unstable/rt2400/debian/patches/series
Log:
  * patches/2.6.22.diff: fix the build of the module with 2.6.22+ kernels
    (closes: bug#432532)


Modified: unstable/rt2400/debian/changelog
===================================================================
--- unstable/rt2400/debian/changelog	2007-07-15 19:31:45 UTC (rev 15)
+++ unstable/rt2400/debian/changelog	2007-07-15 19:56:16 UTC (rev 16)
@@ -2,6 +2,8 @@
 
   * 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
 

Added: unstable/rt2400/debian/patches/2.6.22.diff
===================================================================
--- unstable/rt2400/debian/patches/2.6.22.diff	                        (rev 0)
+++ unstable/rt2400/debian/patches/2.6.22.diff	2007-07-15 19:56:16 UTC (rev 16)
@@ -0,0 +1,53 @@
+--- Module.orig/rt_config.h	2007/05/10 08:45:32	1.8
++++ Module/rt_config.h	2007/06/18 19:39:09	1.9
+@@ -88,6 +88,22 @@
+ #include <asm/irq.h>
+ #include <asm/uaccess.h>
+ 
++#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 */
++
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22))
++#define pci_module_init	pci_register_driver
++#endif
++
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))
++#define skb_reset_mac_header(skb) (skb->mac.raw = skb->data)
++#endif
++
+ #if WIRELESS_EXT > 12
+ #include <net/iw_handler.h> /* New driver API */
+ #endif /* WIRELESS_EXT > 12 */
+--- Module.orig/rtmp.h	2007/04/25 05:28:43	1.10
++++ Module/rtmp.h	2007/06/18 19:39:10	1.11
+@@ -55,14 +55,6 @@
+ #define netdev_priv(_dev)	( _dev->priv )
+ #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 */
+-
+ //
+ //  MACRO for debugging information
+ //
+--- Module.orig/rtmp_data.c	2007/03/21 04:12:20	1.6
++++ Module/rtmp_data.c	2007/06/18 19:39:10	1.7
+@@ -110,7 +110,7 @@
+                     {
+                        skb->dev = pAd->net_dev;
+                        memcpy(skb_put(skb, pRxD->DataByteCnt), pData, pRxD->DataByteCnt);
+-                       skb->mac.raw = skb->data;
++                       skb_reset_mac_header(skb);
+                        skb->pkt_type = PACKET_OTHERHOST;
+                        skb->protocol = htons(ETH_P_802_2);
+                        skb->ip_summed = CHECKSUM_NONE;

Modified: unstable/rt2400/debian/patches/series
===================================================================
--- unstable/rt2400/debian/patches/series	2007-07-15 19:31:45 UTC (rev 15)
+++ unstable/rt2400/debian/patches/series	2007-07-15 19:56:16 UTC (rev 16)
@@ -1,2 +1,3 @@
 000_if_name.diff -p0
 002_linux-headers.diff -p0
+2.6.22.diff -p0