On Mon, Apr 29, 2013 at 11:37:20AM -0400, David Miller wrote: > > This doesn't compile: > > net/sched/em_ipset.c:86:5: error: ‘struct ip_set_adt_opt’ has no member named ‘timeout’ Sorry, I overlooked em_ipset, it was not appropriately adapted after the new ipset extension infrastructure was added. The attached patch fixes the problem. Should I send a new pull request?
>From 8a61fa178549c91822ac4c148053d6b6a519a6d5 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> Date: Mon, 29 Apr 2013 19:44:00 +0200 Subject: [PATCH] sched: em_ipset: fix compilation after new ipset extension infrastructure This fixes compilation for the ipset packet classifier which was not appropriately adapted when the new ipset extension infrastructure was added in (80eddba netfilter: ipset: Introduce extensions to elements in the core). Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> --- net/sched/em_ipset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 1.7.10.4
