From 3ff8e8ae4eac6e63150e8162c89425317cf2f310 Mon Sep 17 00:00:00 2001 From: ElonH Date: Sun, 6 Dec 2020 00:53:55 +0800 Subject: [PATCH] Revert "shortcut-fe: Backward compatible with kernel 4.9" This reverts commit 3cddb450f3ed82d5d411fb3ee608a1dfc709a144. --- package/lean/shortcut-fe/src/sfe_cm.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package/lean/shortcut-fe/src/sfe_cm.c b/package/lean/shortcut-fe/src/sfe_cm.c index d16ced6c4f..18f3475e5b 100644 --- a/package/lean/shortcut-fe/src/sfe_cm.c +++ b/package/lean/shortcut-fe/src/sfe_cm.c @@ -1049,11 +1049,7 @@ static int __init sfe_cm_init(void) */ #ifdef CONFIG_NF_CONNTRACK_EVENTS #ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)) (void)nf_conntrack_register_chain_notifier(&init_net, &sfe_cm_conntrack_notifier); -#else - (void)nf_conntrack_register_notifier(&init_net, &sfe_cm_conntrack_notifier); -#endif /*KERNEL_VERSION(4, 14, 0)*/ #else result = nf_conntrack_register_notifier(&init_net, &sfe_cm_conntrack_notifier); if (result < 0) { @@ -1128,11 +1124,7 @@ static void __exit sfe_cm_exit(void) #ifdef CONFIG_NF_CONNTRACK_EVENTS #ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)) nf_conntrack_unregister_chain_notifier(&init_net, &sfe_cm_conntrack_notifier); -#else - nf_conntrack_unregister_notifier(&init_net, &sfe_cm_conntrack_notifier); -#endif /*KERNEL_VERSION(4, 14, 0)*/ #else nf_conntrack_unregister_notifier(&init_net, &sfe_cm_conntrack_notifier); #endif