debianforum.de

diff aacraid dkms 1.2.1.50663

SNIPPET_DESC:

diff file - compatibility with kernel version 4.4

SNIPPET_CREATION_TIME:

26.07.2016 20:38:21

SNIPPET_PRUNE_TIME:

Unendlich

SNIPPET_TEXT:

1. diff -u -W 160 a/commsup.c b/commsup.c
2. --- a/commsup.c 2016-02-26 12:16:11.000000000 +0100
3. +++ b/commsup.c 2016-05-24 08:55:31.000000000 +0200
4. @@ -3517,7 +3517,12 @@
5.                 dev->aac_msix[0].dev = dev;
6.  
7.                 if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,
8. -                       IRQF_SHARED|IRQF_DISABLED, "aacraid", &(dev->aac_msix[0])) < 0) {
9. +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0))
10. +                       IRQF_SHARED|IRQF_DISABLED,
11. +#else
12. +                       IRQF_SHARED,
13. +#endif
14. +                       "aacraid", &(dev->aac_msix[0])) < 0) {
15.  #if ((LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)) || defined(PCI_HAS_DISABLE_MSI))
16.                         if (dev->msi)
17.                                 pci_disable_msi(dev->pdev);
18. diff -u -W 160 a/linit.c b/linit.c
19. --- a/linit.c   2016-02-26 12:16:11.000000000 +0100
20. +++ b/linit.c   2016-05-24 08:51:48.000000000 +0200
21. @@ -3382,7 +3382,7 @@
22.         .this_id                        = MAXIMUM_NUM_CONTAINERS,
23.         .sg_tablesize                   = 16,
24.         .max_sectors                    = 128,
25. -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
26. +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) && LINUX_VERSION_CODE <= KERNEL_VERSION(4,4,0))
27.      .use_blk_tags           = 1,
28.  #endif
29.  #if (AAC_NUM_IO_FIB > 256)
30. @@ -4009,7 +4009,7 @@
31.  #endif
32.         pci_set_drvdata(pdev, shost);
33.  
34. -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
35. +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) && LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0))
36.      error = scsi_init_shared_tag_map(shost, shost->can_queue);
37.         if (error)
38.                 goto out_deinit;
39. diff -u -W 160 a/rx.c b/rx.c
40. --- a/rx.c      2016-02-26 12:16:11.000000000 +0100
41. +++ b/rx.c      2016-05-24 09:05:54.000000000 +0200
42. @@ -1190,7 +1190,12 @@
43.         dev->msi = aac_msi && !pci_enable_msi(dev->pdev);
44.  #endif
45.         if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,
46. -               IRQF_SHARED|IRQF_DISABLED, "aacraid", dev) < 0) {
47. +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0))
48. +               IRQF_SHARED|IRQF_DISABLED,
49. +#else
50. +               IRQF_SHARED,
51. +#endif
52. +               "aacraid", dev) < 0) {
53.  #if ((LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)) || defined(PCI_HAS_DISABLE_MSI))
54.                 if (dev->msi)
55.                         pci_disable_msi(dev->pdev);
56. diff -u -W 160 a/sa.c b/sa.c
57. --- a/sa.c      2016-02-26 12:16:11.000000000 +0100
58. +++ b/sa.c      2016-05-24 09:07:30.000000000 +0200
59. @@ -419,7 +419,11 @@
60.                 goto error_irq;
61.         dev->sync_mode = 0;             /* sync. mode not supported */
62.         if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,
63. +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0))
64.                 IRQF_SHARED|IRQF_DISABLED,
65. +#else
66. +               IRQF_SHARED,
67. +#endif
68.                 "aacraid", (void *)dev ) < 0) {
69.                 printk(KERN_WARNING "%s%d: Interrupt unavailable.\n",
70.                         name, instance);
71. diff -u -W 160 a/src.c b/src.c
72. --- a/src.c     2016-02-26 12:16:11.000000000 +0100
73. +++ b/src.c     2016-05-24 09:08:38.000000000 +0200
74. @@ -1048,7 +1048,12 @@
75.         dev->aac_msix[0].dev = dev;
76.  
77.         if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,
78. -               IRQF_SHARED|IRQF_DISABLED, "aacraid", &(dev->aac_msix[0])) < 0) {
79. +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0))
80. +               IRQF_SHARED|IRQF_DISABLED,
81. +#else
82. +               IRQF_SHARED,
83. +#endif
84. +               "aacraid", &(dev->aac_msix[0])) < 0) {
85.  #if ((LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)) || defined(PCI_HAS_DISABLE_MSI))
86.                 if (dev->msi)
87.                         pci_disable_msi(dev->pdev);

Quellcode

Hier kannst du den Code kopieren und ihn in deinen bevorzugten Editor einfügen. PASTEBIN_DOWNLOAD_SNIPPET_EXPLAIN