diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-06-25 11:48:23 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2015-06-25 11:48:23 +0200 |
| commit | ff0f4b65fb95474890301c2c10133f2d071ad360 (patch) | |
| tree | b416a0c456833ed09f32fe46096a2670f69d649e | |
| parent | ef8aa19f614cf9a36bb37f3db9c6711e0d39e5c8 (diff) | |
net: sched: Simplify em_ipset_match
em->net is always set and always available, use it in preference
to dev_net(skb->dev).
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
| -rw-r--r-- | kernel/net/sched/em_ipset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/net/sched/em_ipset.c b/kernel/net/sched/em_ipset.c index 53185d5..31a0bd8 100644 --- a/kernel/net/sched/em_ipset.c +++ b/kernel/net/sched/em_ipset.c @@ -112,8 +112,8 @@ static int em_ipset_match(struct sk_buff *skb, struct tcf_ematch *em, rcu_read_lock(); - if (dev && skb->skb_iif) - indev = dev_get_by_index_rcu(dev_net(dev), skb->skb_iif); + if (skb->skb_iif) + indev = dev_get_by_index_rcu(em->net, skb->skb_iif); acpar.in = indev ? indev : dev; acpar.out = dev; |