PKT_SCHED: Fix ingress qdisc to pick up IPv6 packets when using netfilter hooks
Subsystems (3)
PATCH 1/1 PKT_SCHED: Fix ingress qdisc to pick up IPv6 packets when using netfilter hooks
Jamal, close your eyes please.
Fixes the ingress qdisc to pick up IPv6 packets when using the old style netfilter hooks, i.e. when CONFIG_NET_CLS_ACT is not enabled.
Signed-off-by Thomas Graf <[email protected]>
net/sched/sch_ingress.c +19 -1
@@ -14,6 +14,7 @@#include <linux/netdevice.h> #include <linux/rtnetlink.h> #include <linux/netfilter_ipv4.h> +#include <linux/netfilter_ipv6.h> #include <linux/netfilter.h> #include <linux/smp.h> #include <net/pkt_sched.h>
@@ -271,6 +272,14 @@ .priority = NF_IP_PRI_FILTER + 1, }; +static struct nf_hook_ops ing6_ops = { + .hook = ing_hook, + .owner =THIS_MODULE , + .pf =PF_INET6 , + .hooknum =NF_IP6_PRE_ROUTING , + .priority =NF_IP6_PRI_FILTER +1 , +}; +#endif #endif
@@ -297,6 +306,12 @@return -EINVAL ; } nf_registered++; + +if (nf_register_hook (&ing6_ops) <0 ) { +printk ("IPv6 ingress qdisc registration error, " \ +"disabling IPv6 support.\n" ); + }else + nf_registered++; }#endif #endif
@@ -408,8 +423,11 @@unregister_qdisc (&ingress_qdisc_ops);#ifndef CONFIG_NET_CLS_ACT #ifdef CONFIG_NETFILTER -if (nf_registered) +if (nf_registered) {nf_unregister_hook (&ing_ops); +if (nf_registered >1 ) +nf_unregister_hook (&ing6_ops); + }#endif #endif }
Quoted 1 line · On Mon, 31 Jan 2005 19:48:27 +0100 Thomas Graf <[email protected]> wrote:
Jamal, close your eyes please.
:-)
Quoted 4 lines
Fixes the ingress qdisc to pick up IPv6 packets when using the old style netfilter hooks, i.e. when
CONFIG_NET_CLS_ACTis not enabled.Signed-off-by Thomas Graf <[email protected]>
Applied, thanks Thomas.
PATCH 1/1 PKT_SCHED: Fix ingress qdisc to pick up IPv6 packets
Signed-off-by Thomas Graf <[email protected]>
net/sched/sch_ingress.c +20 -2
@@ -14,6 +14,7 @@#include <linux/netdevice.h> #include <linux/rtnetlink.h> #include <linux/netfilter_ipv4.h> +#include <linux/netfilter_ipv6.h> #include <linux/netfilter.h> #include <linux/smp.h> #include <net/pkt_sched.h>
@@ -241,6 +242,15 @@ NF_IP_PRI_FILTER + 1 }; +static struct nf_hook_ops ing6_ops = +{ + {NULL ,NULL }, + ing_hook, +PF_INET6 , +NF_IP6_PRE_ROUTING , +NF_IP6_PRI_FILTER +1 +}; +int ingress_init (struct Qdisc *sch,struct rtattr *opt) {struct ingress_qdisc_data *p =PRIV (sch);
@@ -249,8 +259,13 @@if (nf_register_hook (&ing_ops) <0 ) {printk ("ingress qdisc registration error \n" ); goto error; - } + } nf_registered++; +if (nf_register_hook (&ing6_ops) <0 ) { +printk ("IPv6 ingress qdisc registration error, " \ +"disabling IPv6 support.\n" ); + }else + nf_registered++; }DPRINTK ("ingress_init(sch %p,[qdisc %p],opt %p)\n" ,sch,p,opt);
@@ -374,8 +389,11 @@void cleanup_module (void ) {unregister_qdisc (&ingress_qdisc_ops); -if (nf_registered) +if (nf_registered) {nf_unregister_hook (&ing_ops); +if (nf_registered >1 ) +nf_unregister_hook (&ing6_ops); + } }#endif MODULE_LICENSE ("GPL" );
Re: [PATCH 2.4] PKT_SCHED: Fix ingress qdisc to pick up IPv6 packets
Quoted 1 line · On Wed, 2 Feb 2005 23:36:29 +0100 Thomas Graf <[email protected]> wrote:
Signed-off-by Thomas Graf <[email protected]>
Applied, thanks Thomas.