0100-netfilter-init-fix.patch 5.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120
  1. diff -Naur linux-4.7.3/net/ipv4/netfilter/iptable_filter.c linux-4.7.3.new/net/ipv4/netfilter/iptable_filter.c
  2. --- linux-4.7.3/net/ipv4/netfilter/iptable_filter.c 2016-09-07 08:35:12.000000000 +0200
  3. +++ linux-4.7.3.new/net/ipv4/netfilter/iptable_filter.c 2016-09-20 17:34:57.000156904 +0200
  4. @@ -25,7 +25,7 @@
  5. (1 << NF_INET_LOCAL_OUT))
  6. static int __net_init iptable_filter_table_init(struct net *net);
  7. -static const struct xt_table packet_filter = {
  8. +static const struct xt_table __net_initconst packet_filter = {
  9. .name = "filter",
  10. .valid_hooks = FILTER_VALID_HOOKS,
  11. .me = THIS_MODULE,
  12. diff -Naur linux-4.7.3/net/ipv4/netfilter/iptable_mangle.c linux-4.7.3.new/net/ipv4/netfilter/iptable_mangle.c
  13. --- linux-4.7.3/net/ipv4/netfilter/iptable_mangle.c 2016-09-07 08:35:12.000000000 +0200
  14. +++ linux-4.7.3.new/net/ipv4/netfilter/iptable_mangle.c 2016-09-20 17:35:04.360257550 +0200
  15. @@ -30,7 +30,7 @@
  16. static int __net_init iptable_mangle_table_init(struct net *net);
  17. -static const struct xt_table packet_mangler = {
  18. +static const struct xt_table __net_initconst packet_mangler = {
  19. .name = "mangle",
  20. .valid_hooks = MANGLE_VALID_HOOKS,
  21. .me = THIS_MODULE,
  22. diff -Naur linux-4.7.3/net/ipv4/netfilter/iptable_nat.c linux-4.7.3.new/net/ipv4/netfilter/iptable_nat.c
  23. --- linux-4.7.3/net/ipv4/netfilter/iptable_nat.c 2016-09-07 08:35:12.000000000 +0200
  24. +++ linux-4.7.3.new/net/ipv4/netfilter/iptable_nat.c 2016-09-20 17:35:11.847359932 +0200
  25. @@ -20,7 +20,7 @@
  26. static int __net_init iptable_nat_table_init(struct net *net);
  27. -static const struct xt_table nf_nat_ipv4_table = {
  28. +static const struct xt_table __net_initconst nf_nat_ipv4_table = {
  29. .name = "nat",
  30. .valid_hooks = (1 << NF_INET_PRE_ROUTING) |
  31. (1 << NF_INET_POST_ROUTING) |
  32. diff -Naur linux-4.7.3/net/ipv4/netfilter/iptable_raw.c linux-4.7.3.new/net/ipv4/netfilter/iptable_raw.c
  33. --- linux-4.7.3/net/ipv4/netfilter/iptable_raw.c 2016-09-07 08:35:12.000000000 +0200
  34. +++ linux-4.7.3.new/net/ipv4/netfilter/iptable_raw.c 2016-09-20 17:35:18.424449870 +0200
  35. @@ -12,7 +12,7 @@
  36. static int __net_init iptable_raw_table_init(struct net *net);
  37. -static const struct xt_table packet_raw = {
  38. +static const struct xt_table __net_initconst packet_raw = {
  39. .name = "raw",
  40. .valid_hooks = RAW_VALID_HOOKS,
  41. .me = THIS_MODULE,
  42. diff -Naur linux-4.7.3/net/ipv4/netfilter/iptable_security.c linux-4.7.3.new/net/ipv4/netfilter/iptable_security.c
  43. --- linux-4.7.3/net/ipv4/netfilter/iptable_security.c 2016-09-07 08:35:12.000000000 +0200
  44. +++ linux-4.7.3.new/net/ipv4/netfilter/iptable_security.c 2016-09-20 17:35:28.232583992 +0200
  45. @@ -30,7 +30,7 @@
  46. static int __net_init iptable_security_table_init(struct net *net);
  47. -static const struct xt_table security_table = {
  48. +static const struct xt_table __net_initconst security_table = {
  49. .name = "security",
  50. .valid_hooks = SECURITY_VALID_HOOKS,
  51. .me = THIS_MODULE,
  52. diff -Naur linux-4.7.3/net/ipv6/netfilter/ip6table_filter.c linux-4.7.3.new/net/ipv6/netfilter/ip6table_filter.c
  53. --- linux-4.7.3/net/ipv6/netfilter/ip6table_filter.c 2016-09-07 08:35:12.000000000 +0200
  54. +++ linux-4.7.3.new/net/ipv6/netfilter/ip6table_filter.c 2016-09-20 17:34:01.580392165 +0200
  55. @@ -24,7 +24,7 @@
  56. static int __net_init ip6table_filter_table_init(struct net *net);
  57. -static const struct xt_table packet_filter = {
  58. +static const struct xt_table __net_initconst packet_filter = {
  59. .name = "filter",
  60. .valid_hooks = FILTER_VALID_HOOKS,
  61. .me = THIS_MODULE,
  62. diff -Naur linux-4.7.3/net/ipv6/netfilter/ip6table_mangle.c linux-4.7.3.new/net/ipv6/netfilter/ip6table_mangle.c
  63. --- linux-4.7.3/net/ipv6/netfilter/ip6table_mangle.c 2016-09-07 08:35:12.000000000 +0200
  64. +++ linux-4.7.3.new/net/ipv6/netfilter/ip6table_mangle.c 2016-09-20 17:34:08.893493248 +0200
  65. @@ -25,7 +25,7 @@
  66. static int __net_init ip6table_mangle_table_init(struct net *net);
  67. -static const struct xt_table packet_mangler = {
  68. +static const struct xt_table __net_initconst packet_mangler = {
  69. .name = "mangle",
  70. .valid_hooks = MANGLE_VALID_HOOKS,
  71. .me = THIS_MODULE,
  72. diff -Naur linux-4.7.3/net/ipv6/netfilter/ip6table_nat.c linux-4.7.3.new/net/ipv6/netfilter/ip6table_nat.c
  73. --- linux-4.7.3/net/ipv6/netfilter/ip6table_nat.c 2016-09-07 08:35:12.000000000 +0200
  74. +++ linux-4.7.3.new/net/ipv6/netfilter/ip6table_nat.c 2016-09-20 17:34:15.294581725 +0200
  75. @@ -22,7 +22,7 @@
  76. static int __net_init ip6table_nat_table_init(struct net *net);
  77. -static const struct xt_table nf_nat_ipv6_table = {
  78. +static const struct xt_table __net_initconst nf_nat_ipv6_table = {
  79. .name = "nat",
  80. .valid_hooks = (1 << NF_INET_PRE_ROUTING) |
  81. (1 << NF_INET_POST_ROUTING) |
  82. diff -Naur linux-4.7.3/net/ipv6/netfilter/ip6table_raw.c linux-4.7.3.new/net/ipv6/netfilter/ip6table_raw.c
  83. --- linux-4.7.3/net/ipv6/netfilter/ip6table_raw.c 2016-09-07 08:35:12.000000000 +0200
  84. +++ linux-4.7.3.new/net/ipv6/netfilter/ip6table_raw.c 2016-09-20 17:34:22.939687395 +0200
  85. @@ -11,7 +11,7 @@
  86. static int __net_init ip6table_raw_table_init(struct net *net);
  87. -static const struct xt_table packet_raw = {
  88. +static const struct xt_table __net_initconst packet_raw = {
  89. .name = "raw",
  90. .valid_hooks = RAW_VALID_HOOKS,
  91. .me = THIS_MODULE,
  92. diff -Naur linux-4.7.3/net/ipv6/netfilter/ip6table_security.c linux-4.7.3.new/net/ipv6/netfilter/ip6table_security.c
  93. --- linux-4.7.3/net/ipv6/netfilter/ip6table_security.c 2016-09-07 08:35:12.000000000 +0200
  94. +++ linux-4.7.3.new/net/ipv6/netfilter/ip6table_security.c 2016-09-20 17:34:30.348789803 +0200
  95. @@ -29,7 +29,7 @@
  96. static int __net_init ip6table_security_table_init(struct net *net);
  97. -static const struct xt_table security_table = {
  98. +static const struct xt_table __net_initconst security_table = {
  99. .name = "security",
  100. .valid_hooks = SECURITY_VALID_HOOKS,
  101. .me = THIS_MODULE,