From 237fe7c660e9cdae56279375e362e93e965f63e9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 12 Oct 2015 16:27:08 +0200 Subject: [PATCH] build: support for Linux 4.3 --- configure.ac | 4 ++-- doc/changelog.txt | 2 ++ extensions/xt_condition.c | 3 ++- extensions/xt_quota2.c | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 8576ef8..0e5c6c6 100644 --- a/configure.ac +++ b/configure.ac @@ -63,9 +63,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 1; then + if test "$kmajor" -gt 4 -o "$kmajor" -eq 4 -a "$kminor" -gt 3; then echo "WARNING: That kernel version is not officially supported yet. Continue at own luck."; - elif test "$kmajor" -eq 4 -a "$kminor" -le 1; then + elif test "$kmajor" -eq 4 -a "$kminor" -le 3; then :; elif test "$kmajor" -eq 3 -a "$kminor" -ge 7; then :; diff --git a/doc/changelog.txt b/doc/changelog.txt index 1db972b..bfe73a9 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -1,6 +1,8 @@ HEAD ==== +Enhancements: +- Support for Linux 4.3 v2.8 (2015-08-19) diff --git a/extensions/xt_condition.c b/extensions/xt_condition.c index cc9ee08..fbb21c5 100644 --- a/extensions/xt_condition.c +++ b/extensions/xt_condition.c @@ -66,7 +66,8 @@ static int condition_proc_show(struct seq_file *m, void *data) { const struct condition_variable *var = m->private; - return seq_printf(m, var->enabled ? "1\n" : "0\n"); + seq_printf(m, var->enabled ? "1\n" : "0\n"); + return 0; } static int condition_proc_open(struct inode *inode, struct file *file) diff --git a/extensions/xt_quota2.c b/extensions/xt_quota2.c index b4d142e..8257d05 100644 --- a/extensions/xt_quota2.c +++ b/extensions/xt_quota2.c @@ -67,9 +67,9 @@ static int quota_proc_show(struct seq_file *m, void *data) int ret; spin_lock_bh(&e->lock); - ret = seq_printf(m, "%llu\n", e->quota); + seq_printf(m, "%llu\n", e->quota); spin_unlock_bh(&e->lock); - return ret; + return 0; } static int quota_proc_open(struct inode *inode, struct file *file)