From 71812a20537cacd5e102e2395f6046284919cd63 Mon Sep 17 00:00:00 2001 From: kd6lvw Date: Wed, 10 Jun 2009 19:01:17 -0700 Subject: [PATCH] build: support for Linux 2.6.30 Fix a compile error with xt_quota2. Linux kernel commit v2.6.29-7544-g3ba113d removed the "owner" member. --- doc/changelog.txt | 1 + extensions/xt_quota2.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/doc/changelog.txt b/doc/changelog.txt index baac5a8..ec0ab3c 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -2,6 +2,7 @@ - IPMARK: print missing --shift parameter - build: use readlink -f in extensions/ipset/ +- build: support for Linux 2.6.30 Xtables-addons 1.16 (May 27 2009) diff --git a/extensions/xt_quota2.c b/extensions/xt_quota2.c index a202297..c569ca8 100644 --- a/extensions/xt_quota2.c +++ b/extensions/xt_quota2.c @@ -104,7 +104,9 @@ static struct quota_counter *q2_get_counter(const struct xt_quota_mtinfo2 *q) if (p == NULL || IS_ERR(p)) goto out; +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 29) p->owner = THIS_MODULE; +#endif p->data = e; p->read_proc = quota_proc_read; p->write_proc = quota_proc_write;