diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-11-05 23:57:26 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-06 01:34:21 -0500 |
commit | bd27a8750c9b849068d80e298f99940bb7128b33 (patch) | |
tree | 606acde68192483fe9800b5b7afc3628857a1e60 | |
parent | 40c9c31e388bfd513269df737f874d0cd53c1616 (diff) |
net_cls: Use __dev_get_by_index()
We hold RTNL in tc_dump_tfilter(), we can avoid dev_hold()/dev_put()
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/sched/cls_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 7cf6c0fbc7a6..c024da77824f 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c | |||
@@ -404,6 +404,7 @@ static int tcf_node_dump(struct tcf_proto *tp, unsigned long n, | |||
404 | a->cb->nlh->nlmsg_seq, NLM_F_MULTI, RTM_NEWTFILTER); | 404 | a->cb->nlh->nlmsg_seq, NLM_F_MULTI, RTM_NEWTFILTER); |
405 | } | 405 | } |
406 | 406 | ||
407 | /* called with RTNL */ | ||
407 | static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb) | 408 | static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb) |
408 | { | 409 | { |
409 | struct net *net = sock_net(skb->sk); | 410 | struct net *net = sock_net(skb->sk); |
@@ -422,7 +423,7 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb) | |||
422 | 423 | ||
423 | if (cb->nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*tcm))) | 424 | if (cb->nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*tcm))) |
424 | return skb->len; | 425 | return skb->len; |
425 | if ((dev = dev_get_by_index(&init_net, tcm->tcm_ifindex)) == NULL) | 426 | if ((dev = __dev_get_by_index(&init_net, tcm->tcm_ifindex)) == NULL) |
426 | return skb->len; | 427 | return skb->len; |
427 | 428 | ||
428 | if (!tcm->tcm_parent) | 429 | if (!tcm->tcm_parent) |
@@ -484,7 +485,6 @@ errout: | |||
484 | if (cl) | 485 | if (cl) |
485 | cops->put(q, cl); | 486 | cops->put(q, cl); |
486 | out: | 487 | out: |
487 | dev_put(dev); | ||
488 | return skb->len; | 488 | return skb->len; |
489 | } | 489 | } |
490 | 490 | ||