]> git.pld-linux.org Git - packages/xtables-addons.git/blame - kernel-4.9.256.patch
projects / packages / xtables-addons.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- fix building with kernel 4.9.256
[packages/xtables-addons.git] / kernel-4.9.256.patch
CommitLineData
ffb7c91f
JR		 1diff -ur xtables-addons-2.14/extensions/ACCOUNT/xt_ACCOUNT.c xtables-addons-2.14-256/extensions/ACCOUNT/xt_ACCOUNT.c
2--- xtables-addons-2.14/extensions/ACCOUNT/xt_ACCOUNT.c 2017-11-22 18:29:25.000000000 +0100
3+++ xtables-addons-2.14-256/extensions/ACCOUNT/xt_ACCOUNT.c 2021-02-06 22:39:05.896766609 +0100
4@@ -482,7 +482,7 @@
5 static unsigned int
6 ipt_acc_target(struct sk_buff *skb, const struct xt_action_param *par)
7 {
8-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
9+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
10 struct ipt_acc_net *ian = net_generic(par->state->net, ipt_acc_net_id);
11 #else
12 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
13diff -ur xtables-addons-2.14/extensions/compat_xtables.h xtables-addons-2.14-256/extensions/compat_xtables.h
14--- xtables-addons-2.14/extensions/compat_xtables.h 2017-11-22 18:29:25.000000000 +0100
15+++ xtables-addons-2.14-256/extensions/compat_xtables.h 2021-02-06 22:42:17.377058406 +0100
16@@ -82,7 +82,7 @@
17
18 static inline struct net *par_net(const struct xt_action_param *par)
19 {
20-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
21+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
22 return par->state->net;
23 #else
24 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
25diff -ur xtables-addons-2.14/extensions/xt_CHAOS.c xtables-addons-2.14-256/extensions/xt_CHAOS.c
26--- xtables-addons-2.14/extensions/xt_CHAOS.c 2017-11-22 18:29:25.000000000 +0100
27+++ xtables-addons-2.14-256/extensions/xt_CHAOS.c 2021-02-06 22:39:05.896766609 +0100
28@@ -58,7 +58,7 @@
29
30 {
31 struct xt_action_param local_par;
32-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
33+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
34 local_par.state = par->state;
35 #else
36 local_par.in = par->in,
37@@ -78,7 +78,7 @@
38 destiny = (info->variant == XTCHAOS_TARPIT) ? xt_tarpit : xt_delude;
39 {
40 struct xt_action_param local_par;
41-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
42+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
43 local_par.state = par->state;
44 #else
45 local_par.in = par->in;
46@@ -108,7 +108,7 @@
47
48 if ((unsigned int)prandom_u32() <= reject_percentage) {
49 struct xt_action_param local_par;
50-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
51+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
52 local_par.state = par->state;
53 #else
54 local_par.in = par->in;
55@@ -123,7 +123,7 @@
56 /* TARPIT/DELUDE may not be called from the OUTPUT chain */
57 if (iph->protocol == IPPROTO_TCP &&
58 info->variant != XTCHAOS_NORMAL &&
59-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
60+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
61 par->state->hook
62 #else
63 par->hooknum
64diff -ur xtables-addons-2.14/extensions/xt_DELUDE.c xtables-addons-2.14-256/extensions/xt_DELUDE.c
65--- xtables-addons-2.14/extensions/xt_DELUDE.c 2017-11-22 18:29:25.000000000 +0100
66+++ xtables-addons-2.14-256/extensions/xt_DELUDE.c 2021-02-06 22:39:05.896766609 +0100
67@@ -152,7 +152,7 @@
68 * actually want to have a connection open, we are still going to drop it.
69 */
70 delude_send_reset(par_net(par), skb,
71-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
72+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
73 par->state->hook
74 #else
75 par->hooknum
76diff -ur xtables-addons-2.14/extensions/xt_DNETMAP.c xtables-addons-2.14-256/extensions/xt_DNETMAP.c
77--- xtables-addons-2.14/extensions/xt_DNETMAP.c 2017-11-22 18:29:25.000000000 +0100
78+++ xtables-addons-2.14-256/extensions/xt_DNETMAP.c 2021-02-06 22:39:05.896766609 +0100
79@@ -356,7 +356,7 @@
80 static unsigned int
81 dnetmap_tg(struct sk_buff *skb, const struct xt_action_param *par)
82 {
83-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
84+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
85 struct net *net = dev_net(par->state->in ? par->state->in : par->state->out);
86 #else
87 struct net *net = dev_net(par->in ? par->in : par->out);
88@@ -371,7 +371,7 @@
89 struct dnetmap_entry *e;
90 struct dnetmap_prefix *p;
91 __s32 jttl;
92-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
93+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
94 unsigned int hooknum = par->state->hook;
95 #else
96 unsigned int hooknum = par->hooknum;
97@@ -500,7 +500,7 @@
98 newrange.max_addr.ip = postnat_ip;
99 newrange.min_proto = mr->min_proto;
100 newrange.max_proto = mr->max_proto;
101-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
102+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
103 return nf_nat_setup_info(ct, &newrange, HOOK2MANIP(par->state->hook));
104 #else
105 return nf_nat_setup_info(ct, &newrange, HOOK2MANIP(par->hooknum));
106diff -ur xtables-addons-2.14/extensions/xt_ECHO.c xtables-addons-2.14-256/extensions/xt_ECHO.c
107--- xtables-addons-2.14/extensions/xt_ECHO.c 2017-11-22 18:29:25.000000000 +0100
108+++ xtables-addons-2.14-256/extensions/xt_ECHO.c 2021-02-06 22:39:05.896766609 +0100
109@@ -35,7 +35,7 @@
110 void *payload;
111 struct flowi6 fl;
112 struct dst_entry *dst = NULL;
113-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
114+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
115 struct net *net = dev_net((par->state->in != NULL) ? par->state->in : par->state->out);
116 #else
117 struct net *net = dev_net((par->in != NULL) ? par->in : par->out);
118diff -ur xtables-addons-2.14/extensions/xt_iface.c xtables-addons-2.14-256/extensions/xt_iface.c
119--- xtables-addons-2.14/extensions/xt_iface.c 2017-11-22 18:29:25.000000000 +0100
120+++ xtables-addons-2.14-256/extensions/xt_iface.c 2021-02-06 22:39:05.896766609 +0100
121@@ -45,13 +45,13 @@
122 const struct xt_action_param *par, struct net_device **put)
123 {
124 if (info->flags & XT_IFACE_DEV_IN)
125-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
126+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
127 return par->state->in;
128 #else
129 return par->in;
130 #endif
131 else if (info->flags & XT_IFACE_DEV_OUT)
132-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
133+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
134 return par->state->out;
135 #else
136 return par->out;
137diff -ur xtables-addons-2.14/extensions/xt_LOGMARK.c xtables-addons-2.14-256/extensions/xt_LOGMARK.c
138--- xtables-addons-2.14/extensions/xt_LOGMARK.c 2017-11-22 18:29:25.000000000 +0100
139+++ xtables-addons-2.14-256/extensions/xt_LOGMARK.c 2021-02-06 22:39:05.896766609 +0100
140@@ -82,7 +82,7 @@
141 printk("<%u>%.*s""iif=%d hook=%s nfmark=0x%x "
142 "secmark=0x%x classify=0x%x",
143 info->level, (unsigned int)sizeof(info->prefix), info->prefix,
144-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
145+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
146 skb_ifindex(skb), hook_names[par->state->hook],
147 #else
148 skb_ifindex(skb), hook_names[par->hooknum],
149diff -ur xtables-addons-2.14/extensions/xt_lscan.c xtables-addons-2.14-256/extensions/xt_lscan.c
150--- xtables-addons-2.14/extensions/xt_lscan.c 2017-11-22 18:29:25.000000000 +0100
151+++ xtables-addons-2.14-256/extensions/xt_lscan.c 2021-02-06 22:39:05.896766609 +0100
152@@ -204,7 +204,7 @@
153 unsigned int n;
154
155 n = lscan_mt_full(ctdata->mark & connmark_mask, ctstate,
156-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
157+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
158 par->state->in == init_net.loopback_dev, tcph,
159 #else
160 par->in == init_net.loopback_dev, tcph,
161diff -ur xtables-addons-2.14/extensions/xt_TARPIT.c xtables-addons-2.14-256/extensions/xt_TARPIT.c
162--- xtables-addons-2.14/extensions/xt_TARPIT.c 2017-11-22 18:29:25.000000000 +0100
163+++ xtables-addons-2.14-256/extensions/xt_TARPIT.c 2021-02-06 22:39:05.896766609 +0100
164@@ -455,7 +455,7 @@
165 if (iph->frag_off & htons(IP_OFFSET))
166 return NF_DROP;
167
168-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
169+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
170 tarpit_tcp4(par_net(par), skb, par->state->hook, info->variant);
171 #else
172 tarpit_tcp4(par_net(par), skb, par->hooknum, info->variant);
173@@ -501,7 +501,7 @@
174 return NF_DROP;
175 }
176
177-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
178+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
179 tarpit_tcp6(par_net(par), skb, par->state->hook, info->variant);
180 #else
181 tarpit_tcp6(par_net(par), skb, par->hooknum, info->variant);
Additional extensions for xtables packet filtering system
This page took 0.152628 seconds and 4 git commands to generate.