summaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2013-04-27 14:28:55 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2013-04-29 20:08:54 +0200
commit075e64c041b5d3c29651965608e1e76505e01d54 (patch)
tree471cbca37506311f347a673335aba37040591d88 /net/sched
parent8672d4d1a00b59057bb1f9659259967d2a19e086 (diff)
downloadop-kernel-dev-075e64c041b5d3c29651965608e1e76505e01d54.zip
op-kernel-dev-075e64c041b5d3c29651965608e1e76505e01d54.tar.gz
netfilter: ipset: Introduce extensions to elements in the core
Introduce extensions to elements in the core and prepare timeout as the first one. This patch also modifies the em_ipset classifier to use the new extension struct layout. Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/em_ipset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/em_ipset.c b/net/sched/em_ipset.c
index 3130320..938b7cb 100644
--- a/net/sched/em_ipset.c
+++ b/net/sched/em_ipset.c
@@ -83,7 +83,7 @@ static int em_ipset_match(struct sk_buff *skb, struct tcf_ematch *em,
opt.dim = set->dim;
opt.flags = set->flags;
opt.cmdflags = 0;
- opt.timeout = ~0u;
+ opt.ext.timeout = ~0u;
network_offset = skb_network_offset(skb);
skb_pull(skb, network_offset);
OpenPOWER on IntegriCloud