]> git.pld-linux.org Git - packages/kernel.git/commitdiff
- fix function redefinition
authorJan Rękorajski <baggins@pld-linux.org>
Fri, 31 Jan 2014 19:52:32 +0000 (20:52 +0100)
committerJan Rękorajski <baggins@pld-linux.org>
Fri, 31 Jan 2014 19:52:32 +0000 (20:52 +0100)
kernel-imq.patch

index edeb4c4c2a40f89d2d6a788d606d98973e2dd4d2..e08c3a6abf13ab24109d44eb64edbba7a7a203f6 100644 (file)
@@ -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[] = {
 +      {
This page took 0.193724 seconds and 4 git commands to generate.