diff options
author | William Pitcock <nenolod@dereferenced.org> | 2014-05-08 22:26:03 +0000 |
---|---|---|
committer | William Pitcock <nenolod@dereferenced.org> | 2014-05-08 22:26:03 +0000 |
commit | c385248c161e1099a11b1931a3630136272f5de4 (patch) | |
tree | 3aad39e4e2b9bda5427cbe7a4b32ddcdd8f35156 /main/ipfw-grsec/ipfw-hookops.patch | |
parent | 2f4ba4fefd39abc22bdaba325a01df38f8414ad4 (diff) | |
download | aports-c385248c161e1099a11b1931a3630136272f5de4.tar.bz2 aports-c385248c161e1099a11b1931a3630136272f5de4.tar.xz |
main/ipfw-grsec: merge 3.14.2 changes
Diffstat (limited to 'main/ipfw-grsec/ipfw-hookops.patch')
-rw-r--r-- | main/ipfw-grsec/ipfw-hookops.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/main/ipfw-grsec/ipfw-hookops.patch b/main/ipfw-grsec/ipfw-hookops.patch new file mode 100644 index 0000000000..f057f1e747 --- /dev/null +++ b/main/ipfw-grsec/ipfw-hookops.patch @@ -0,0 +1,16 @@ +--- ipfw3-2012.orig/kipfw/ipfw2_mod.c ++++ ipfw3-2012/kipfw/ipfw2_mod.c +@@ -466,7 +466,12 @@ + * so we have an #ifdef to set the proper argument type. + */ + static unsigned int +-call_ipfw(unsigned int hooknum, ++call_ipfw( ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0) ++ unsigned int hooknum, ++#else ++ const struct nf_hook_ops *hooknum, ++#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) // in 2.6.22 we have ** + struct sk_buff **skb, + #else |