[packages/kernel] - fixed imq_nf_hook definition

baggins baggins at pld-linux.org
Sat Feb 1 10:11:56 CET 2014


commit e855b7df3177f7d7762db89d2e3ec527e2dbcef0
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Feb 1 10:11:44 2014 +0100

    - fixed imq_nf_hook definition

 kernel-imq.patch | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/kernel-imq.patch b/kernel-imq.patch
index e08c3a6..25e5963 100644
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -182,7 +182,7 @@ new file mode 100644
 index 0000000..801bc8c
 --- /dev/null
 +++ b/drivers/net/imq.c
-@@ -0,0 +1,1010 @@
+@@ -0,0 +1,1012 @@
 +/*
 + *             Pseudo-driver for the intermediate queue device.
 + *
@@ -359,7 +359,8 @@ index 0000000..801bc8c
 +
 +static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num);
 +
-+static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
++static unsigned int imq_nf_hook(const struct nf_hook_ops *ops,
++				struct sk_buff *pskb,
 +				const struct net_device *indev,
 +				const struct net_device *outdev,
 +				int (*okfn)(struct sk_buff *));
@@ -979,7 +980,8 @@ index 0000000..801bc8c
 +	return retval;
 +}
 +
-+static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
++static unsigned int imq_nf_hook(const struct nf_hook_ops *ops,
++				struct sk_buff *pskb,
 +				const struct net_device *indev,
 +				const struct net_device *outdev,
 +				int (*okfn)(struct sk_buff *))
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/e855b7df3177f7d7762db89d2e3ec527e2dbcef0



More information about the pld-cvs-commit mailing list