anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-06 04:35:12 +02:00
Code Issues Releases Wiki Activity

build: add support for Linux 4.18

Browse Source
This commit is contained in:
Jan Engelhardt
2018-08-14 14:29:30 +02:00
parent 4603d3e0f4
commit 3ea761a1ed
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -3,6 +3,7 @@
*.lo
*.loT
*.o
.cache.mk
.deps/
.dirstamp
.libs/

4
configure.ac
View File

@@ -57,9 +57,9 @@ if test -n "$kbuilddir"; then
echo "WARNING: Version detection did not succeed. Continue at own luck.";
else
echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
if test "$kmajor" -gt 4 -o "$kmajor" -eq 4 -a "$kminor" -gt 17; then
if test "$kmajor" -gt 4 -o "$kmajor" -eq 4 -a "$kminor" -gt 18; then
echo "WARNING: That kernel version is not officially supported yet. Continue at own luck.";
elif test "$kmajor" -eq 4 -a "$kminor" -ge 17; then
elif test "$kmajor" -eq 4 -a "$kminor" -ge 18; then
:
else
echo "WARNING: That kernel version is not officially supported.";

2
doc/changelog.txt
View File

@@ -2,7 +2,7 @@
HEAD
====
Enhancements:
- support for Linux 4.17
- support for Linux 4.17, 4.18
v3.0 (2018-02-12)

4
extensions/xt_DNETMAP.c
View File

@@ -363,7 +363,11 @@ dnetmap_tg(struct sk_buff *skb, const struct xt_action_param *par)
__be32 prenat_ip, postnat_ip, prenat_ip_prev;
const struct xt_DNETMAP_tginfo *tginfo = par->targinfo;
const struct nf_nat_range *mr = &tginfo->prefix;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0)
struct nf_nat_range2 newrange;
#else
struct nf_nat_range newrange;
#endif
struct dnetmap_entry *e;
struct dnetmap_prefix *p;
__s32 jttl;