[packages/kernel] - fix function redefinition
baggins
baggins at pld-linux.org
Fri Jan 31 20:52:54 CET 2014
commit ce6e5d6e80ffa61cf30605de846900911b9f2bed
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Jan 31 20:52:32 2014 +0100
- fix function redefinition
kernel-imq.patch | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/kernel-imq.patch b/kernel-imq.patch
index edeb4c4..e08c3a6 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,1007 @@
+@@ -0,0 +1,1010 @@
+/*
+ * Pseudo-driver for the intermediate queue device.
+ *
@@ -359,7 +359,10 @@ index 0000000..801bc8c
+
+static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num);
+
-+static nf_hookfn imq_nf_hook;
++static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
++ const struct net_device *indev,
++ const struct net_device *outdev,
++ int (*okfn)(struct sk_buff *));
+
+static struct nf_hook_ops imq_ops[] = {
+ {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/ce6e5d6e80ffa61cf30605de846900911b9f2bed
More information about the pld-cvs-commit
mailing list