Skip to content

xtables-addons: fix build with Linux 6.18#29099

Closed
pesa1234 wants to merge 1 commit intoopenwrt:masterfrom
pesa1234:fix-xtables-addons
Closed

xtables-addons: fix build with Linux 6.18#29099
pesa1234 wants to merge 1 commit intoopenwrt:masterfrom
pesa1234:fix-xtables-addons

Conversation

@pesa1234
Copy link
Copy Markdown
Contributor

@pesa1234 pesa1234 commented Apr 8, 2026

📦 Package Details

Maintainer: Jo-Philipp Wich jo@mein.io

Description:
ACCOUNT, pknock and LUA still use EXTRA_CFLAGS in their Kbuild files to add local include paths.

With Linux 6.18, external modules should use ccflags-y for these include directories instead. Otherwise the additional include paths are not propagated reliably and the build can fail with missing compat_xtables.h.

Linux 6.18 also changed the timer API used by pknock, removing from_timer() and del_timer(). Add a small compatibility wrapper so pknock uses timer_container_of() and timer_delete() on 6.18+ while remaining compatible with older kernels.


🧪 Run Testing Details

  • OpenWrt Version: snapshot
  • OpenWrt Target/Subtarget: mediatek/filogic
  • OpenWrt Device: gl-mt6000

✅ Formalities

  • I have reviewed the CONTRIBUTING.md file for detailed contributing guidelines.

If your PR contains a patch:

  • It can be applied using git am
  • It has been refreshed to avoid offsets, fuzzes, etc., using
    make package/<your-package>/refresh V=s
  • It is structured in a way that it is potentially upstreamable
    (e.g., subject line, commit description, etc.)
    We must try to upstream patches to reduce maintenance burden.

ACCOUNT, pknock and LUA still use EXTRA_CFLAGS in their Kbuild files
to add local include paths.

With Linux 6.18, external modules should use ccflags-y for these
include directories instead. Otherwise the additional include paths are
not propagated reliably and the build can fail with missing
compat_xtables.h.

Linux 6.18 also changed the timer API used by pknock, removing
from_timer() and del_timer(). Add a small compatibility wrapper so
pknock uses timer_container_of() and timer_delete() on 6.18+ while
remaining compatible with older kernels.

Bump PKG_RELEASE accordingly.

Signed-off-by: Andrea Pesaresi <andreapesaresi82@gmail.com>
@BKPepe
Copy link
Copy Markdown
Member

BKPepe commented Apr 8, 2026

@pesa1234
Copy link
Copy Markdown
Contributor Author

pesa1234 commented Apr 8, 2026

Similar PR https://github.com/openwrt/packages/pull/28167/changes

Sorry, I didn't see it. Feel free to close or let me know if I need to do it.

Thanks a lot for point me on it

@feckert
Copy link
Copy Markdown
Member

feckert commented Apr 29, 2026

I close this. PR https://github.com/openwrt/packages/pull/28167/changes was merged

@feckert feckert closed this Apr 29, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants