KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

backport acx100 2.6.24 fixes from SVN

Browse source 
SVN-Revision: 10425
This commit is contained in:
Matteo Croce 2008-02-08 20:15:23 +00:00
parent cae0acba53
commit cf02f1c6b2
1 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
package/acx/patches/003-2.6.24-compat.diff Normal file
View file

@ -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 */