Skip to content

Commit

Permalink
build: add support for Linux 4.18
Browse files Browse the repository at this point in the history
  • Loading branch information
jengelh committed Aug 14, 2018
1 parent 4603d3e commit 3ea761a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*.lo
*.loT
*.o
.cache.mk
.deps/
.dirstamp
.libs/
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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.";
Expand Down
2 changes: 1 addition & 1 deletion doc/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
HEAD
====
Enhancements:
- support for Linux 4.17
- support for Linux 4.17, 4.18


v3.0 (2018-02-12)
Expand Down
4 changes: 4 additions & 0 deletions extensions/xt_DNETMAP.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 3ea761a

Please sign in to comment.