summaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-19 01:28:40 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-19 01:28:40 +0000
commit8abb719409c9060a7c0676f76e9182c1e0b8ca46 (patch)
treeb88cc5a6cd513a04a512b7e6215c873c90a1c5dd /net/sched
parentf01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff)
Merge with 2.3.99-pre1.
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/sch_ingress.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index 64a915d7e..ddc738fcc 100644
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -229,7 +229,6 @@ static struct nf_hook_ops ing_ops =
{
{ NULL, NULL},
ing_hook,
- NULL,
PF_INET,
NF_IP_PRE_ROUTING,
1