projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2fd1dc9
)
net: sched: Simplify em_ipset_match
author
Eric W. Biederman
<ebiederm@xmission.com>
Wed, 17 Jun 2015 15:28:17 +0000
(10:28 -0500)
committer
Pablo Neira Ayuso
<pablo@netfilter.org>
Thu, 18 Jun 2015 19:14:28 +0000
(21:14 +0200)
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>
net/sched/em_ipset.c
patch
|
blob
|
history
diff --git
a/net/sched/em_ipset.c
b/net/sched/em_ipset.c
index a3d79c8bf3b873b52163e938585bc01957bc6956..df0328ba6a48243056526fbc044f8c0e392f4f3c 100644
(file)
--- 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;