backport acx100 2.6.24 fixes from SVN
authorMatteo Croce <rootkit85@yahoo.it>
Fri, 8 Feb 2008 20:15:23 +0000 (20:15 +0000)
committerMatteo Croce <rootkit85@yahoo.it>
Fri, 8 Feb 2008 20:15:23 +0000 (20:15 +0000)
SVN-Revision: 10425

package/acx/patches/003-2.6.24-compat.diff [new file with mode: 0644]

diff --git a/package/acx/patches/003-2.6.24-compat.diff b/package/acx/patches/003-2.6.24-compat.diff
new file mode 100644 (file)
index 0000000..c216dd1
--- /dev/null
@@ -0,0 +1,42 @@
+diff -u acx-20080112/pci.c acx-20080112.new/pci.c
+--- acx-20080112/pci.c 2008-02-08 19:20:41.000000000 +0000
++++ acx-20080112.new/pci.c     2008-02-08 19:05:46.000000000 +0000
+@@ -1632,7 +1632,7 @@
+       acx_show_card_eeprom_id(adev);
+ #endif /* NONESSENTIAL_FEATURES */
+-#ifdef SET_MODULE_OWNER
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) && defined(SET_MODULE_OWNER)
+       SET_MODULE_OWNER(ndev);
+ #endif
+       SET_NETDEV_DEV(ndev, &pdev->dev);
+@@ -2128,7 +2128,7 @@
+ /* TODO: pci_set_power_state(pdev, PCI_D0); ? */
+       /* request shared IRQ handler */
+-      if (request_irq(ndev->irq, acxpci_i_interrupt, SA_SHIRQ, ndev->name, ndev)) {
++      if (request_irq(ndev->irq, acxpci_i_interrupt, IRQF_SHARED, ndev->name, ndev)) {
+               printk("%s: request_irq FAILED\n", ndev->name);
+               result = -EAGAIN;
+               goto done;
+@@ -4339,7 +4339,7 @@
+         acx_show_card_eeprom_id(adev);
+ #endif /* NONESSENTIAL_FEATURES */
+-#ifdef SET_MODULE_OWNER
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) && defined(SET_MODULE_OWNER)
+         SET_MODULE_OWNER(ndev);
+ #endif
+         SET_NETDEV_DEV(ndev, adev->bus_dev);
+diff -u acx-20080112/usb.c acx-20080112.new/usb.c
+--- acx-20080112/usb.c 2008-01-12 12:27:38.000000000 +0000
++++ acx-20080112.new/usb.c     2008-02-08 19:01:34.000000000 +0000
+@@ -859,7 +859,9 @@
+       ndev->watchdog_timeo = 4 * HZ;
+ #endif
+       ndev->change_mtu = &acx_e_change_mtu;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
+       SET_MODULE_OWNER(ndev);
++#endif
+       /* Setup private driver context */