summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2015-06-17 10:28:17 -0500
committerPablo Neira Ayuso <pablo@netfilter.org>2015-06-18 21:14:28 +0200
commit17cebfd097fe8a21902602db5196f48e5a9d34e8 (patch)
tree188a473a2c3c19eb894adc84f37c360771ea6aa2
parent2fd1dc910b39c97549d2d42a916985795ca8a641 (diff)
downloadlinux-17cebfd097fe8a21902602db5196f48e5a9d34e8.tar.bz2
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>
-rw-r--r--net/sched/em_ipset.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/em_ipset.c b/net/sched/em_ipset.c
index a3d79c8bf3b8..df0328ba6a48 100644
--- a/net/sched/em_ipset.c
+++ b/net/sched/em_ipset.c
@@ -92,8 +92,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;