001-fix-compile.patch 2.8 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495
  1. --- a/src/vectoring/Makefile
  2. +++ b/src/vectoring/Makefile
  3. @@ -1,5 +1,5 @@
  4. -obj-$(CONFIG_PTM_VECTORING) += ifxmips_vectoring.o
  5. -obj-y += ifxmips_vectoring_stub.o
  6. -ifeq ($(CONFIG_DSL_MEI_CPE_DRV),)
  7. -obj-$(CONFIG_PTM_VECTORING) += ifxmips_vectoring_test.o
  8. -endif
  9. +obj-m += ltq_vectoring.o
  10. +ltq_vectoring-objs = ifxmips_vectoring.o ifxmips_vectoring_stub.o
  11. +
  12. +obj-m += ltq_vectoring_test.o
  13. +ltq_vectoring_test-objs = ifxmips_vectoring_test.o
  14. --- a/src/vectoring/ifxmips_vectoring.c
  15. +++ b/src/vectoring/ifxmips_vectoring.c
  16. @@ -30,9 +30,11 @@
  17. /*
  18. * Common Head File
  19. */
  20. +#include <linux/version.h>
  21. #include <linux/kernel.h>
  22. #include <linux/module.h>
  23. #include <linux/etherdevice.h>
  24. +#include <linux/proc_fs.h>
  25. /*
  26. * Chip Specific Head File
  27. @@ -239,7 +241,7 @@ static int netdev_event_handler(struct n
  28. && event != NETDEV_UNREGISTER )
  29. return NOTIFY_DONE;
  30. - netif = (struct net_device *)netdev;
  31. + netif = netdev_notifier_info_to_dev(netdev);
  32. if ( strcmp(netif->name, "ptm0") != 0 )
  33. return NOTIFY_DONE;
  34. @@ -356,6 +358,7 @@ static int proc_write_dbg(struct file *f
  35. return count;
  36. }
  37. +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0)
  38. static struct file_operations g_proc_file_vectoring_dbg_seq_fops = {
  39. .owner = THIS_MODULE,
  40. .open = proc_read_dbg_seq_open,
  41. @@ -364,6 +367,15 @@ static struct file_operations g_proc_fil
  42. .llseek = seq_lseek,
  43. .release = single_release,
  44. };
  45. +#else
  46. +static struct proc_ops g_proc_file_vectoring_dbg_seq_fops = {
  47. + .proc_open = proc_read_dbg_seq_open,
  48. + .proc_read = seq_read,
  49. + .proc_write = proc_write_dbg,
  50. + .proc_lseek = seq_lseek,
  51. + .proc_release = single_release,
  52. +};
  53. +#endif
  54. static int proc_read_dbg_seq_open(struct inode *inode, struct file *file)
  55. {
  56. --- a/src/vectoring/ifxmips_vectoring_test.c
  57. +++ b/src/vectoring/ifxmips_vectoring_test.c
  58. @@ -1,6 +1,8 @@
  59. +#include <linux/version.h>
  60. #include <linux/kernel.h>
  61. #include <linux/module.h>
  62. #include <linux/proc_fs.h>
  63. +#include <linux/seq_file.h>
  64. #include "ifxmips_vectoring_stub.h"
  65. @@ -82,6 +84,7 @@ static int proc_write_vectoring(struct f
  66. return count;
  67. }
  68. +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0)
  69. static struct file_operations g_proc_file_vectoring_seq_fops = {
  70. .owner = THIS_MODULE,
  71. .open = proc_read_vectoring_seq_open,
  72. @@ -90,6 +93,15 @@ static struct file_operations g_proc_fil
  73. .llseek = seq_lseek,
  74. .release = single_release,
  75. };
  76. +#else
  77. +static struct proc_ops g_proc_file_vectoring_seq_fops = {
  78. + .proc_open = proc_read_vectoring_seq_open,
  79. + .proc_read = seq_read,
  80. + .proc_write = proc_write_vectoring,
  81. + .proc_lseek = seq_lseek,
  82. + .proc_release = single_release,
  83. +};
  84. +#endif
  85. static int proc_read_vectoring_seq_open(struct inode *inode, struct file *file)
  86. {