fix for Linux 4.14

Signed-off-by: Christian Svensson <blue@cmd.nu>
dhtech · Oct 7, 2018 · 3e5a8af · 3e5a8af
1 parent 7147f77
commit 3e5a8af
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/sdk-6.5.12-gpl-modules/systems/bde/linux/kernel/linux-kernel-bde.c b/sdk-6.5.12-gpl-modules/systems/bde/linux/kernel/linux-kernel-bde.c
@@ -1973,14 +1973,16 @@ _msi_connect(bde_ctrl_t *ctrl)
         for (i = 0; i < ctrl->msix_cnt; i++)
                 ctrl->entries[i].entry = i;
 
-        ret = pci_enable_msix(ctrl->pci_device,
-                                           ctrl->entries, ctrl->msix_cnt);
+        ret = pci_enable_msix_range(ctrl->pci_device,
+                                    ctrl->entries,
+                                    ctrl->msix_cnt, ctrl->msix_cnt);
         if (ret > 0) {
             /* Not enough vectors available , Retry MSI-X */
             gprintk("Retrying with MSI-X interrupts = %d\n", ret);
             ctrl->msix_cnt = ret;
-            ret = pci_enable_msix(ctrl->pci_device,
-                                           ctrl->entries, ctrl->msix_cnt);
+            ret = pci_enable_msix_range(ctrl->pci_device,
+                                        ctrl->entries,
+                                        ctrl->msix_cnt, ctrl->msix_cnt);
             if (ret != 0)
                 goto er_intx_free;
         } else if (ret < 0) {

diff --git a/sdk-6.5.12-gpl-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c b/sdk-6.5.12-gpl-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c
@@ -4771,8 +4771,7 @@ bkn_tx(struct sk_buff *skb, struct net_device *dev)
         bkn_suspend_tx(sinfo);
     }
 
-    dev->trans_start = jiffies;
-
+    netif_trans_update(dev);
     spin_unlock_irqrestore(&sinfo->lock, flags);
 
     return 0;

diff --git a/sdk-6.5.12-gpl-modules/systems/linux/kernel/modules/include/lkm.h b/sdk-6.5.12-gpl-modules/systems/linux/kernel/modules/include/lkm.h
@@ -61,12 +61,12 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/stat.h>
-#include <linux/sched.h>
+#include <linux/sched/signal.h>
 #include <linux/delay.h>
+#include <linux/uaccess.h>
 
 #include <asm/io.h>
 #include <asm/hardirq.h>
-#include <asm/uaccess.h>
 
 #ifdef CONFIG_DEVFS_FS
 #include <linux/devfs_fs_kernel.h>