diff --git a/doc/changelog.txt b/doc/changelog.txt index 9171a09..870a57d 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -3,6 +3,7 @@ HEAD ==== - compat_xtables: return bool for match_check and target_check in 2.6.23..34 - ipset: enable building of ip_set_ipport{ip,net}hash.ko +- SYSRQ: resolve compile error with Linux 2.6.36 Xtables-addons 1.28 (July 24 2010) diff --git a/extensions/xt_SYSRQ.c b/extensions/xt_SYSRQ.c index a013051..d8c0100 100644 --- a/extensions/xt_SYSRQ.c +++ b/extensions/xt_SYSRQ.c @@ -152,7 +152,9 @@ static unsigned int sysrq_tg(const void *pdata, uint16_t len) sysrq_seqno = new_seqno; for (i = 0; i < len && data[i] != ','; ++i) { printk(KERN_INFO KBUILD_MODNAME ": SysRq %c\n", data[i]); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) + handle_sysrq(data[i]); +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) handle_sysrq(data[i], NULL); #else handle_sysrq(data[i], NULL, NULL); @@ -187,7 +189,9 @@ static unsigned int sysrq_tg(const void *pdata, uint16_t len) return NF_DROP; } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) + handle_sysrq(c); +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) handle_sysrq(c, NULL); #else handle_sysrq(c, NULL, NULL);